warnings fixes

src/alloc.c

@@ -559,7 +559,7 @@ static void hl_gc_check_track();
 void *hl_gc_alloc_gen( int size, int flags ) {
 	void *ptr;
 	int time = 0;
-	int allocated;
+	int allocated = 0;
 #ifdef HL_BUMP_ALLOC
 	if( !alloc_all ) {
 		int tot = 3<<29;

src/std/socket.c

@@ -1,468 +1,469 @@
-/*
- * Copyright (C)2005-2016 Haxe Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#ifdef _WIN32
-
-#define FD_SETSIZE	65536
-#pragma warning(disable:4548)
-
-#	include <string.h>
-#	define _WINSOCKAPI_
-#	include <hl.h>
-#	include <winsock2.h>
-#	define FDSIZE(n)	(sizeof(u_int) + (n) * sizeof(SOCKET))
-#	define SHUT_WR		SD_SEND
-#	define SHUT_RD		SD_RECEIVE
-#	define SHUT_RDWR	SD_BOTH
-	typedef int _sockaddr;
-#else
-#	define _GNU_SOURCE
-#	include <string.h>
-#	include <sys/types.h>
-#	include <sys/socket.h>
-#	include <sys/time.h>
-#	include <netinet/in.h>
-#	include <netinet/tcp.h>
-#	include <arpa/inet.h>
-#	include <unistd.h>
-#	include <netdb.h>
-#	include <fcntl.h>
-#	include <errno.h>
-#	include <stdio.h>
-#	include <poll.h>
-	typedef int SOCKET;
-#	define closesocket close
-#	define SOCKET_ERROR (-1)
-#	define INVALID_SOCKET (-1)
-	typedef unsigned int _sockaddr;
-#endif
-#ifdef HL_LINUX
-#	include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,44)
-#	include <sys/epoll.h>
-#	define HAS_EPOLL
-#endif
-#endif
-#ifndef HAS_EPOLL
-#	define EPOLLIN 0x001
-#	define EPOLLOUT 0x004
-#endif
-
-#include <hl.h>
-
-#if defined(HL_WIN) || defined(HL_MAC)
-#	define MSG_NOSIGNAL 0
-#endif
-
-typedef struct _hl_socket {
-	SOCKET sock;
-} hl_socket;
-
-static int block_error() {
-#ifdef HL_WIN
-	int err = WSAGetLastError();
-	if( err == WSAEWOULDBLOCK || err == WSAEALREADY || err == WSAETIMEDOUT )
-#else
-	if( errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS || errno == EALREADY )
-#endif
-		return -1;
-	return -2;
-}
-
-HL_PRIM void hl_socket_init() {
-#ifdef HL_WIN
-	static bool init_done = false;
-	static WSADATA init_data;
-	if( !init_done ) {
-		WSAStartup(MAKEWORD(2,0),&init_data);
-		init_done = true;
-	}
-#endif
-}
-
-HL_PRIM hl_socket *hl_socket_new( bool udp ) {
-	SOCKET s;
-	if( udp )
-		s = socket(AF_INET,SOCK_DGRAM,0);
-	else
-		s = socket(AF_INET,SOCK_STREAM,0);
-	if( s == INVALID_SOCKET )
-		return NULL;
-#	ifdef HL_MAC
-	setsockopt(s,SOL_SOCKET,SO_NOSIGPIPE,NULL,0);
-#	endif
-#	ifdef HL_POSIX
-	// we don't want sockets to be inherited in case of exec
-	{
-		int old = fcntl(s,F_GETFD,0);
-		if( old >= 0 ) fcntl(s,F_SETFD,old|FD_CLOEXEC);
-	}
-#	endif
-	{
-		hl_socket *hs = hl_gc_alloc_noptr(sizeof(hl_socket));
-		hs->sock = s;
-		return hs;
-	}
-}
-
-HL_PRIM void hl_socket_close( hl_socket *s ) {
-	if( !s ) return;
-	closesocket(s->sock);
-	s->sock = INVALID_SOCKET;
-}
-
-HL_PRIM int hl_socket_send_char( hl_socket *s, int c ) {
-	char cc;
-	cc = (char)(unsigned char)c;
-	if( !s )
-		return -2;
-	if( send(s->sock,&cc,1,MSG_NOSIGNAL) == SOCKET_ERROR )
-		return block_error();
-	return 1;
-}
-
-HL_PRIM int hl_socket_send( hl_socket *s, vbyte *buf, int pos, int len ) {
-	int r;
-	if( !s )
-		return -2;
-	r = send(s->sock, (char*)buf + pos, len, MSG_NOSIGNAL);
-	if( r == SOCKET_ERROR )
-		return block_error();
-	return len;
-}
-
-
-HL_PRIM int hl_socket_recv( hl_socket *s, vbyte *buf, int pos, int len ) {
-	int	ret;
-	if( !s )
-		return -2;
-	ret = recv(s->sock, (char*)buf + pos, len, MSG_NOSIGNAL);
-	if( ret == SOCKET_ERROR )
-		return block_error();
-	return ret;
-}
-
-HL_PRIM int hl_socket_recv_char( hl_socket *s ) {
-	char cc;
-	int ret;
-	if( !s ) return -2;
-	ret = recv(s->sock,&cc,1,MSG_NOSIGNAL);
-	if( ret == SOCKET_ERROR || ret == 0 )
-		return block_error();
-	return (unsigned char)cc;
-}
-
-HL_PRIM int hl_host_resolve( vbyte *host ) {
-	unsigned int ip;
-	ip = inet_addr((char*)host);
-	if( ip == INADDR_NONE ) {
-		struct hostent *h;
-#	if defined(HL_WIN) || defined(HL_MAC) || defined (HL_CYGWIN)
-		h = gethostbyname((char*)host);
-#	else
-		struct hostent hbase;
-		char buf[1024];
-		int errcode;
-		gethostbyname_r((char*)host,&hbase,buf,1024,&h,&errcode);
-#	endif
-		if( h == NULL )
-			return 0;
-		ip = *((unsigned int*)h->h_addr_list[0]);
-	}
-	return ip;
-}
-
-HL_PRIM vbyte *hl_host_to_string( int ip ) {
-	struct in_addr i;
-	*(int*)&i = ip;
-	return (vbyte*)inet_ntoa(i);
-}
-
-HL_PRIM vbyte *hl_host_reverse( int ip ) {
-	struct hostent *h;
-#	if defined(HL_WIN) || defined(HL_MAC) || defined(HL_CYGWIN)
-	h = gethostbyaddr((char *)&ip,4,AF_INET);
-#	else
-	struct hostent htmp;
-	int errcode;
-	char buf[1024];
-	gethostbyaddr_r((char*)&ip,4,AF_INET,&htmp,buf,1024,&h,&errcode);
-#	endif
-	if( h == NULL )
-		return NULL; 
-	return (vbyte*)h->h_name;
-}
-
-HL_PRIM vbyte *hl_host_local() {
-	char buf[256];
-	if( gethostname(buf,256) == SOCKET_ERROR )
-		return NULL;
-	return hl_copy_bytes((vbyte*)buf,(int)strlen(buf)+1);
-}
-
-HL_PRIM bool hl_socket_connect( hl_socket *s, int host, int port ) {
-	struct sockaddr_in addr;
-	memset(&addr,0,sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons((unsigned short)port);
-	*(int*)&addr.sin_addr.s_addr = host;
-	if( !s ) return false;
-	if( connect(s->sock,(struct sockaddr*)&addr,sizeof(addr)) != 0 ) {
-		int err = block_error();
-		if( err == -1 ) return true; // in progress
-		return false;
-	}
-	return true;
-}
-
-HL_PRIM bool hl_socket_listen( hl_socket *s, int n ) {
-	if( !s ) return false;
-	return listen(s->sock,n) != SOCKET_ERROR;
-}
-
-HL_PRIM bool hl_socket_bind( hl_socket *s, int host, int port ) {
-	struct sockaddr_in addr;
-	if( !s ) return false;
-	memset(&addr,0,sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons((unsigned short)port);
-	*(int*)&addr.sin_addr.s_addr = host;
-	#ifndef HL_WIN
-	int opt = 1;
-	setsockopt(s->sock,SOL_SOCKET,SO_REUSEADDR,(char*)&opt,sizeof(opt));
-	#endif
-	return bind(s->sock,(struct sockaddr*)&addr,sizeof(addr)) != SOCKET_ERROR;
-}
-
-HL_PRIM hl_socket *hl_socket_accept( hl_socket *s ) {
-	struct sockaddr_in addr;
-	_sockaddr addrlen = sizeof(addr);
-	SOCKET nsock;
-	hl_socket *hs;
-	if( !s ) return NULL;
-	nsock = accept(s->sock,(struct sockaddr*)&addr,&addrlen);
-	if( nsock == INVALID_SOCKET )
-		return NULL;
-	hs = (hl_socket*)hl_gc_alloc_noptr(sizeof(hl_socket));
-	hs->sock = nsock;
-	return hs;
-}
-
-HL_PRIM bool hl_socket_peer( hl_socket *s, int *host, int *port ) {
-	struct sockaddr_in addr;
-	_sockaddr addrlen = sizeof(addr);
-	if( !s || getpeername(s->sock,(struct sockaddr*)&addr,&addrlen) == SOCKET_ERROR )
-		return false;
-	*host = *(int*)&addr.sin_addr;
-	*port = ntohs(addr.sin_port);
-	return true;
-}
-
-HL_PRIM bool hl_socket_host( hl_socket *s, int *host, int *port ) {
-	struct sockaddr_in addr;
-	_sockaddr addrlen = sizeof(addr);
-	if( !s || getsockname(s->sock,(struct sockaddr*)&addr,&addrlen) == SOCKET_ERROR )
-		return false;
-	*host = *(int*)&addr.sin_addr;
-	*port = ntohs(addr.sin_port);
-	return true;
-}
-
-static void init_timeval( double f, struct timeval *t ) {
-	t->tv_usec = (int)((f - (int)f) * 1000000);
-	t->tv_sec = (int)f;
-}
-
-HL_PRIM bool hl_socket_set_timeout( hl_socket *s, double t ) {
-#ifdef HL_WIN
-	int time = (int)(t * 1000);
-#else
-	struct timeval time;
-	init_timeval(t,&time);
-#endif
-	if( !s ) return false;
-	if( setsockopt(s->sock,SOL_SOCKET,SO_SNDTIMEO,(char*)&time,sizeof(time)) != 0 )
-		return false;
-	if( setsockopt(s->sock,SOL_SOCKET,SO_RCVTIMEO,(char*)&time,sizeof(time)) != 0 )
-		return false;
-	return true;
-}
-
-HL_PRIM bool hl_socket_shutdown( hl_socket *s, bool r, bool w ) {
-	if( !s )
-		return false;
-	if( !r && !w )
-		return true;
-	return shutdown(s->sock,r?(w?SHUT_RDWR:SHUT_RD):SHUT_WR) == 0;
-}
-
-HL_PRIM bool hl_socket_set_blocking( hl_socket *s, bool b ) {
-#ifdef HL_WIN
-	unsigned long arg = b?0:1;
-	if( !s ) return false;
-	return ioctlsocket(s->sock,FIONBIO,&arg) == 0;
-#else
-	int rights;
-	if( !s ) return false;
-	rights = fcntl(s->sock,F_GETFL);
-	if( rights == -1 )
-		return false;
-	if( b )
-		rights &= ~O_NONBLOCK;
-	else
-		rights |= O_NONBLOCK;
-	return fcntl(s->sock,F_SETFL,rights) != -1;
-#endif
-}
-
-HL_PRIM bool hl_socket_set_fast_send( hl_socket *s, bool b ) {
-	int fast = b;
-	if( !s ) return false;
-	return setsockopt(s->sock,IPPROTO_TCP,TCP_NODELAY,(char*)&fast,sizeof(fast)) == 0;
-}
-
-HL_PRIM int hl_socket_send_to( hl_socket *s, char *data, int len, int host, int port ) {
-	struct sockaddr_in addr;
-	if( !s ) return -2;
-	memset(&addr,0,sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons((unsigned short)port);
-	*(int*)&addr.sin_addr.s_addr = host;
-	len = sendto(s->sock, data, len, MSG_NOSIGNAL, (struct sockaddr*)&addr, sizeof(addr));
-	if( len == SOCKET_ERROR )
-		return block_error();
-	return len;
-}
-
-HL_PRIM int hl_socket_recv_from( hl_socket *s, char *data, int len, int *host, int *port ) {
-	struct sockaddr_in saddr;
-	int slen = sizeof(saddr);
-	if( !s ) return -2;
-	len = recvfrom(s->sock, data, len, MSG_NOSIGNAL, (struct sockaddr*)&saddr, &slen);
-	if( len == SOCKET_ERROR ) {
-#ifdef	HL_WIN
-		if( WSAGetLastError() == WSAECONNRESET )
-			len = 0;
-		else
-#endif
-		return block_error();
-	}
-	*host = *(int*)&saddr.sin_addr;
-	*port = ntohs(saddr.sin_port);
-	return len;
-}
-
-HL_PRIM int hl_socket_fd_size( int size ) {
-	if( size > FD_SETSIZE )
-		return -1;
-#	ifdef HL_WIN
-	return FDSIZE(size);
-#	else
-	return sizeof(fd_set);
-#	endif
-}
-
-static fd_set *make_socket_set( varray *a, char **tmp, int *tmp_size, unsigned int *max ) {
-	fd_set *set = (fd_set*)*tmp;
-	int i, req;
-	if( a == NULL )
-		return set;
-	req = hl_socket_fd_size(a->size);
-	if( *tmp_size < req )
-		return NULL;
-	*tmp_size -= req;
-	FD_ZERO(set);
-	for(i=0;i<a->size;i++) {
-		hl_socket *s= hl_aptr(a,hl_socket*)[i];
-		if( s== NULL ) break;
-		if( s->sock > *max ) *max = s->sock;
-		FD_SET(s->sock,set);
-	}
-	return set;
-}
-
-static void make_array_result( fd_set *set, varray *a ) {
-	int i;
-	int pos = 0;
-	hl_socket **aptr = hl_aptr(a,hl_socket*);
-	if( a == NULL )
-		return;
-	for(i=0;i<a->size;i++) {
-		hl_socket *s = aptr[i];
-		if( s == NULL )
-			break;
-		if( FD_ISSET(s->sock,set) )
-			aptr[pos++] = s;
-	}
-	if( pos < a->size )
-		aptr[pos++] = NULL;
-}
-
-HL_PRIM bool hl_socket_select( varray *ra, varray *wa, varray *ea, char *tmp, int tmp_size, double timeout ) {
-	struct timeval tval, *tt;
-	fd_set *rs, *ws, *es;
-	unsigned int max = 0;
-	rs = make_socket_set(ra,&tmp,&tmp_size,&max);
-	ws = make_socket_set(wa,&tmp,&tmp_size,&max);
-	es = make_socket_set(ea,&tmp,&tmp_size,&max);
-	if( rs == NULL || ws == NULL || es == NULL )
-		return false;
-	if( timeout < 0 )
-		tt = NULL;
-	else {
-		tt = &tval;
-		init_timeval(timeout,tt);
-	}
-	if( select((int)(max+1),ra?rs:NULL,wa?ws:NULL,ea?es:NULL,tt) == SOCKET_ERROR )
-		return false;
-	make_array_result(rs,ra);
-	make_array_result(ws,wa);
-	make_array_result(es,ea);
-	return true;
-}
-
-#define _SOCK	_ABSTRACT(hl_socket)
-DEFINE_PRIM(_VOID,socket_init,_NO_ARG);
-DEFINE_PRIM(_SOCK,socket_new,_BOOL);
-DEFINE_PRIM(_VOID,socket_close,_SOCK);
-DEFINE_PRIM(_I32,socket_send_char,_SOCK _I32);
-DEFINE_PRIM(_I32,socket_send,_SOCK _BYTES _I32 _I32 );
-DEFINE_PRIM(_I32,socket_recv,_SOCK _BYTES _I32 _I32 );
-DEFINE_PRIM(_I32,socket_recv_char, _SOCK);
-DEFINE_PRIM(_I32,host_resolve,_BYTES);
-DEFINE_PRIM(_BYTES,host_to_string,_I32);
-DEFINE_PRIM(_BYTES,host_reverse,_I32);
-DEFINE_PRIM(_BYTES,host_local,_NO_ARG);
-DEFINE_PRIM(_BOOL,socket_connect,_SOCK _I32 _I32);
-DEFINE_PRIM(_BOOL,socket_listen,_SOCK _I32);
-DEFINE_PRIM(_BOOL,socket_bind,_SOCK _I32 _I32);
-DEFINE_PRIM(_SOCK,socket_accept,_SOCK);
-DEFINE_PRIM(_BOOL,socket_peer,_SOCK _REF(_I32) _REF(_I32));
-DEFINE_PRIM(_BOOL,socket_host,_SOCK _REF(_I32) _REF(_I32));
-DEFINE_PRIM(_BOOL,socket_set_timeout,_SOCK _F64);
-DEFINE_PRIM(_BOOL,socket_shutdown,_SOCK _BOOL _BOOL);
-DEFINE_PRIM(_BOOL,socket_set_blocking,_SOCK _BOOL);
-DEFINE_PRIM(_BOOL,socket_set_fast_send,_SOCK _BOOL);
-
-DEFINE_PRIM(_I32, socket_send_to, _SOCK _BYTES _I32 _I32 _I32);
-DEFINE_PRIM(_I32, socket_recv_from, _SOCK _BYTES _I32 _REF(_I32) _REF(_I32));
-DEFINE_PRIM(_I32, socket_fd_size, _I32 );
-DEFINE_PRIM(_BOOL, socket_select, _ARR _ARR _ARR _BYTES _I32 _F64);
+/*
+ * Copyright (C)2005-2016 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#ifdef _WIN32
+
+#define FD_SETSIZE	65536
+#pragma warning(disable:4548)
+
+#	include <string.h>
+#	define _WINSOCKAPI_
+#	include <hl.h>
+#	include <winsock2.h>
+#	define FDSIZE(n)	(sizeof(u_int) + (n) * sizeof(SOCKET))
+#	define SHUT_WR		SD_SEND
+#	define SHUT_RD		SD_RECEIVE
+#	define SHUT_RDWR	SD_BOTH
+	typedef int _sockaddr;
+	typedef int socklen_t;
+#else
+#	define _GNU_SOURCE
+#	include <string.h>
+#	include <sys/types.h>
+#	include <sys/socket.h>
+#	include <sys/time.h>
+#	include <netinet/in.h>
+#	include <netinet/tcp.h>
+#	include <arpa/inet.h>
+#	include <unistd.h>
+#	include <netdb.h>
+#	include <fcntl.h>
+#	include <errno.h>
+#	include <stdio.h>
+#	include <poll.h>
+	typedef int SOCKET;
+#	define closesocket close
+#	define SOCKET_ERROR (-1)
+#	define INVALID_SOCKET (-1)
+	typedef unsigned int _sockaddr;
+#endif
+#ifdef HL_LINUX
+#	include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,44)
+#	include <sys/epoll.h>
+#	define HAS_EPOLL
+#endif
+#endif
+#ifndef HAS_EPOLL
+#	define EPOLLIN 0x001
+#	define EPOLLOUT 0x004
+#endif
+
+#include <hl.h>
+
+#if defined(HL_WIN) || defined(HL_MAC)
+#	define MSG_NOSIGNAL 0
+#endif
+
+typedef struct _hl_socket {
+	SOCKET sock;
+} hl_socket;
+
+static int block_error() {
+#ifdef HL_WIN
+	int err = WSAGetLastError();
+	if( err == WSAEWOULDBLOCK || err == WSAEALREADY || err == WSAETIMEDOUT )
+#else
+	if( errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS || errno == EALREADY )
+#endif
+		return -1;
+	return -2;
+}
+
+HL_PRIM void hl_socket_init() {
+#ifdef HL_WIN
+	static bool init_done = false;
+	static WSADATA init_data;
+	if( !init_done ) {
+		WSAStartup(MAKEWORD(2,0),&init_data);
+		init_done = true;
+	}
+#endif
+}
+
+HL_PRIM hl_socket *hl_socket_new( bool udp ) {
+	SOCKET s;
+	if( udp )
+		s = socket(AF_INET,SOCK_DGRAM,0);
+	else
+		s = socket(AF_INET,SOCK_STREAM,0);
+	if( s == INVALID_SOCKET )
+		return NULL;
+#	ifdef HL_MAC
+	setsockopt(s,SOL_SOCKET,SO_NOSIGPIPE,NULL,0);
+#	endif
+#	ifdef HL_POSIX
+	// we don't want sockets to be inherited in case of exec
+	{
+		int old = fcntl(s,F_GETFD,0);
+		if( old >= 0 ) fcntl(s,F_SETFD,old|FD_CLOEXEC);
+	}
+#	endif
+	{
+		hl_socket *hs = hl_gc_alloc_noptr(sizeof(hl_socket));
+		hs->sock = s;
+		return hs;
+	}
+}
+
+HL_PRIM void hl_socket_close( hl_socket *s ) {
+	if( !s ) return;
+	closesocket(s->sock);
+	s->sock = INVALID_SOCKET;
+}
+
+HL_PRIM int hl_socket_send_char( hl_socket *s, int c ) {
+	char cc;
+	cc = (char)(unsigned char)c;
+	if( !s )
+		return -2;
+	if( send(s->sock,&cc,1,MSG_NOSIGNAL) == SOCKET_ERROR )
+		return block_error();
+	return 1;
+}
+
+HL_PRIM int hl_socket_send( hl_socket *s, vbyte *buf, int pos, int len ) {
+	int r;
+	if( !s )
+		return -2;
+	r = send(s->sock, (char*)buf + pos, len, MSG_NOSIGNAL);
+	if( r == SOCKET_ERROR )
+		return block_error();
+	return len;
+}
+
+
+HL_PRIM int hl_socket_recv( hl_socket *s, vbyte *buf, int pos, int len ) {
+	int	ret;
+	if( !s )
+		return -2;
+	ret = recv(s->sock, (char*)buf + pos, len, MSG_NOSIGNAL);
+	if( ret == SOCKET_ERROR )
+		return block_error();
+	return ret;
+}
+
+HL_PRIM int hl_socket_recv_char( hl_socket *s ) {
+	char cc;
+	int ret;
+	if( !s ) return -2;
+	ret = recv(s->sock,&cc,1,MSG_NOSIGNAL);
+	if( ret == SOCKET_ERROR || ret == 0 )
+		return block_error();
+	return (unsigned char)cc;
+}
+
+HL_PRIM int hl_host_resolve( vbyte *host ) {
+	unsigned int ip;
+	ip = inet_addr((char*)host);
+	if( ip == INADDR_NONE ) {
+		struct hostent *h;
+#	if defined(HL_WIN) || defined(HL_MAC) || defined (HL_CYGWIN)
+		h = gethostbyname((char*)host);
+#	else
+		struct hostent hbase;
+		char buf[1024];
+		int errcode;
+		gethostbyname_r((char*)host,&hbase,buf,1024,&h,&errcode);
+#	endif
+		if( h == NULL )
+			return 0;
+		ip = *((unsigned int*)h->h_addr_list[0]);
+	}
+	return ip;
+}
+
+HL_PRIM vbyte *hl_host_to_string( int ip ) {
+	struct in_addr i;
+	*(int*)&i = ip;
+	return (vbyte*)inet_ntoa(i);
+}
+
+HL_PRIM vbyte *hl_host_reverse( int ip ) {
+	struct hostent *h;
+#	if defined(HL_WIN) || defined(HL_MAC) || defined(HL_CYGWIN)
+	h = gethostbyaddr((char *)&ip,4,AF_INET);
+#	else
+	struct hostent htmp;
+	int errcode;
+	char buf[1024];
+	gethostbyaddr_r((char*)&ip,4,AF_INET,&htmp,buf,1024,&h,&errcode);
+#	endif
+	if( h == NULL )
+		return NULL;
+	return (vbyte*)h->h_name;
+}
+
+HL_PRIM vbyte *hl_host_local() {
+	char buf[256];
+	if( gethostname(buf,256) == SOCKET_ERROR )
+		return NULL;
+	return hl_copy_bytes((vbyte*)buf,(int)strlen(buf)+1);
+}
+
+HL_PRIM bool hl_socket_connect( hl_socket *s, int host, int port ) {
+	struct sockaddr_in addr;
+	memset(&addr,0,sizeof(addr));
+	addr.sin_family = AF_INET;
+	addr.sin_port = htons((unsigned short)port);
+	*(int*)&addr.sin_addr.s_addr = host;
+	if( !s ) return false;
+	if( connect(s->sock,(struct sockaddr*)&addr,sizeof(addr)) != 0 ) {
+		int err = block_error();
+		if( err == -1 ) return true; // in progress
+		return false;
+	}
+	return true;
+}
+
+HL_PRIM bool hl_socket_listen( hl_socket *s, int n ) {
+	if( !s ) return false;
+	return listen(s->sock,n) != SOCKET_ERROR;
+}
+
+HL_PRIM bool hl_socket_bind( hl_socket *s, int host, int port ) {
+	struct sockaddr_in addr;
+	if( !s ) return false;
+	memset(&addr,0,sizeof(addr));
+	addr.sin_family = AF_INET;
+	addr.sin_port = htons((unsigned short)port);
+	*(int*)&addr.sin_addr.s_addr = host;
+	#ifndef HL_WIN
+	int opt = 1;
+	setsockopt(s->sock,SOL_SOCKET,SO_REUSEADDR,(char*)&opt,sizeof(opt));
+	#endif
+	return bind(s->sock,(struct sockaddr*)&addr,sizeof(addr)) != SOCKET_ERROR;
+}
+
+HL_PRIM hl_socket *hl_socket_accept( hl_socket *s ) {
+	struct sockaddr_in addr;
+	_sockaddr addrlen = sizeof(addr);
+	SOCKET nsock;
+	hl_socket *hs;
+	if( !s ) return NULL;
+	nsock = accept(s->sock,(struct sockaddr*)&addr,&addrlen);
+	if( nsock == INVALID_SOCKET )
+		return NULL;
+	hs = (hl_socket*)hl_gc_alloc_noptr(sizeof(hl_socket));
+	hs->sock = nsock;
+	return hs;
+}
+
+HL_PRIM bool hl_socket_peer( hl_socket *s, int *host, int *port ) {
+	struct sockaddr_in addr;
+	_sockaddr addrlen = sizeof(addr);
+	if( !s || getpeername(s->sock,(struct sockaddr*)&addr,&addrlen) == SOCKET_ERROR )
+		return false;
+	*host = *(int*)&addr.sin_addr;
+	*port = ntohs(addr.sin_port);
+	return true;
+}
+
+HL_PRIM bool hl_socket_host( hl_socket *s, int *host, int *port ) {
+	struct sockaddr_in addr;
+	_sockaddr addrlen = sizeof(addr);
+	if( !s || getsockname(s->sock,(struct sockaddr*)&addr,&addrlen) == SOCKET_ERROR )
+		return false;
+	*host = *(int*)&addr.sin_addr;
+	*port = ntohs(addr.sin_port);
+	return true;
+}
+
+static void init_timeval( double f, struct timeval *t ) {
+	t->tv_usec = (int)((f - (int)f) * 1000000);
+	t->tv_sec = (int)f;
+}
+
+HL_PRIM bool hl_socket_set_timeout( hl_socket *s, double t ) {
+#ifdef HL_WIN
+	int time = (int)(t * 1000);
+#else
+	struct timeval time;
+	init_timeval(t,&time);
+#endif
+	if( !s ) return false;
+	if( setsockopt(s->sock,SOL_SOCKET,SO_SNDTIMEO,(char*)&time,sizeof(time)) != 0 )
+		return false;
+	if( setsockopt(s->sock,SOL_SOCKET,SO_RCVTIMEO,(char*)&time,sizeof(time)) != 0 )
+		return false;
+	return true;
+}
+
+HL_PRIM bool hl_socket_shutdown( hl_socket *s, bool r, bool w ) {
+	if( !s )
+		return false;
+	if( !r && !w )
+		return true;
+	return shutdown(s->sock,r?(w?SHUT_RDWR:SHUT_RD):SHUT_WR) == 0;
+}
+
+HL_PRIM bool hl_socket_set_blocking( hl_socket *s, bool b ) {
+#ifdef HL_WIN
+	unsigned long arg = b?0:1;
+	if( !s ) return false;
+	return ioctlsocket(s->sock,FIONBIO,&arg) == 0;
+#else
+	int rights;
+	if( !s ) return false;
+	rights = fcntl(s->sock,F_GETFL);
+	if( rights == -1 )
+		return false;
+	if( b )
+		rights &= ~O_NONBLOCK;
+	else
+		rights |= O_NONBLOCK;
+	return fcntl(s->sock,F_SETFL,rights) != -1;
+#endif
+}
+
+HL_PRIM bool hl_socket_set_fast_send( hl_socket *s, bool b ) {
+	int fast = b;
+	if( !s ) return false;
+	return setsockopt(s->sock,IPPROTO_TCP,TCP_NODELAY,(char*)&fast,sizeof(fast)) == 0;
+}
+
+HL_PRIM int hl_socket_send_to( hl_socket *s, char *data, int len, int host, int port ) {
+	struct sockaddr_in addr;
+	if( !s ) return -2;
+	memset(&addr,0,sizeof(addr));
+	addr.sin_family = AF_INET;
+	addr.sin_port = htons((unsigned short)port);
+	*(int*)&addr.sin_addr.s_addr = host;
+	len = sendto(s->sock, data, len, MSG_NOSIGNAL, (struct sockaddr*)&addr, sizeof(addr));
+	if( len == SOCKET_ERROR )
+		return block_error();
+	return len;
+}
+
+HL_PRIM int hl_socket_recv_from( hl_socket *s, char *data, int len, int *host, int *port ) {
+	struct sockaddr_in saddr;
+	socklen_t slen = sizeof(saddr);
+	if( !s ) return -2;
+	len = recvfrom(s->sock, data, len, MSG_NOSIGNAL, (struct sockaddr*)&saddr, &slen);
+	if( len == SOCKET_ERROR ) {
+#ifdef	HL_WIN
+		if( WSAGetLastError() == WSAECONNRESET )
+			len = 0;
+		else
+#endif
+		return block_error();
+	}
+	*host = *(int*)&saddr.sin_addr;
+	*port = ntohs(saddr.sin_port);
+	return len;
+}
+
+HL_PRIM int hl_socket_fd_size( int size ) {
+	if( size > FD_SETSIZE )
+		return -1;
+#	ifdef HL_WIN
+	return FDSIZE(size);
+#	else
+	return sizeof(fd_set);
+#	endif
+}
+
+static fd_set *make_socket_set( varray *a, char **tmp, int *tmp_size, unsigned int *max ) {
+	fd_set *set = (fd_set*)*tmp;
+	int i, req;
+	if( a == NULL )
+		return set;
+	req = hl_socket_fd_size(a->size);
+	if( *tmp_size < req )
+		return NULL;
+	*tmp_size -= req;
+	FD_ZERO(set);
+	for(i=0;i<a->size;i++) {
+		hl_socket *s= hl_aptr(a,hl_socket*)[i];
+		if( s== NULL ) break;
+		if( s->sock > *max ) *max = s->sock;
+		FD_SET(s->sock,set);
+	}
+	return set;
+}
+
+static void make_array_result( fd_set *set, varray *a ) {
+	int i;
+	int pos = 0;
+	hl_socket **aptr = hl_aptr(a,hl_socket*);
+	if( a == NULL )
+		return;
+	for(i=0;i<a->size;i++) {
+		hl_socket *s = aptr[i];
+		if( s == NULL )
+			break;
+		if( FD_ISSET(s->sock,set) )
+			aptr[pos++] = s;
+	}
+	if( pos < a->size )
+		aptr[pos++] = NULL;
+}
+
+HL_PRIM bool hl_socket_select( varray *ra, varray *wa, varray *ea, char *tmp, int tmp_size, double timeout ) {
+	struct timeval tval, *tt;
+	fd_set *rs, *ws, *es;
+	unsigned int max = 0;
+	rs = make_socket_set(ra,&tmp,&tmp_size,&max);
+	ws = make_socket_set(wa,&tmp,&tmp_size,&max);
+	es = make_socket_set(ea,&tmp,&tmp_size,&max);
+	if( rs == NULL || ws == NULL || es == NULL )
+		return false;
+	if( timeout < 0 )
+		tt = NULL;
+	else {
+		tt = &tval;
+		init_timeval(timeout,tt);
+	}
+	if( select((int)(max+1),ra?rs:NULL,wa?ws:NULL,ea?es:NULL,tt) == SOCKET_ERROR )
+		return false;
+	make_array_result(rs,ra);
+	make_array_result(ws,wa);
+	make_array_result(es,ea);
+	return true;
+}
+
+#define _SOCK	_ABSTRACT(hl_socket)
+DEFINE_PRIM(_VOID,socket_init,_NO_ARG);
+DEFINE_PRIM(_SOCK,socket_new,_BOOL);
+DEFINE_PRIM(_VOID,socket_close,_SOCK);
+DEFINE_PRIM(_I32,socket_send_char,_SOCK _I32);
+DEFINE_PRIM(_I32,socket_send,_SOCK _BYTES _I32 _I32 );
+DEFINE_PRIM(_I32,socket_recv,_SOCK _BYTES _I32 _I32 );
+DEFINE_PRIM(_I32,socket_recv_char, _SOCK);
+DEFINE_PRIM(_I32,host_resolve,_BYTES);
+DEFINE_PRIM(_BYTES,host_to_string,_I32);
+DEFINE_PRIM(_BYTES,host_reverse,_I32);
+DEFINE_PRIM(_BYTES,host_local,_NO_ARG);
+DEFINE_PRIM(_BOOL,socket_connect,_SOCK _I32 _I32);
+DEFINE_PRIM(_BOOL,socket_listen,_SOCK _I32);
+DEFINE_PRIM(_BOOL,socket_bind,_SOCK _I32 _I32);
+DEFINE_PRIM(_SOCK,socket_accept,_SOCK);
+DEFINE_PRIM(_BOOL,socket_peer,_SOCK _REF(_I32) _REF(_I32));
+DEFINE_PRIM(_BOOL,socket_host,_SOCK _REF(_I32) _REF(_I32));
+DEFINE_PRIM(_BOOL,socket_set_timeout,_SOCK _F64);
+DEFINE_PRIM(_BOOL,socket_shutdown,_SOCK _BOOL _BOOL);
+DEFINE_PRIM(_BOOL,socket_set_blocking,_SOCK _BOOL);
+DEFINE_PRIM(_BOOL,socket_set_fast_send,_SOCK _BOOL);
+
+DEFINE_PRIM(_I32, socket_send_to, _SOCK _BYTES _I32 _I32 _I32);
+DEFINE_PRIM(_I32, socket_recv_from, _SOCK _BYTES _I32 _REF(_I32) _REF(_I32));
+DEFINE_PRIM(_I32, socket_fd_size, _I32 );
+DEFINE_PRIM(_BOOL, socket_select, _ARR _ARR _ARR _BYTES _I32 _F64);

src/std/thread.c

@@ -1,148 +1,149 @@
-/*
- * Copyright (C)2005-2016 Haxe Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#include <hl.h>
-
-#ifndef HL_WIN
-#	include <pthread.h>
-#	include <sys/syscall.h>
-#endif
-
-HL_PRIM hl_thread *hl_thread_current() {
-#	ifdef HL_WIN
-	return (hl_thread*)(int_val)GetCurrentThreadId();
-#	else
-	return (hl_thread*)pthread_self();
-#	endif
-}
-
-HL_PRIM int hl_thread_id() {
-#	ifdef HL_WIN
-	return (int)GetCurrentThreadId();
-#	else
-#	ifdef SYS_gettid
-	return syscall(SYS_gettid);
-#	else
-	hl_error("hl_thread_id() not available for this platform");
-	return -1;
-#	endif
-#	endif
-}
-
-HL_PRIM hl_thread *hl_thread_start( void *callback, void *param, bool withGC ) {
-	if( withGC ) hl_error("Threads with garbage collector are currently not supported");
-#	ifdef HL_WIN
-	DWORD tid;
-	HANDLE h = CreateThread(NULL,0,callback,param,0,&tid);
-	if( h == NULL )
-		return NULL;
-	CloseHandle(h);
-	return (hl_thread*)(int_val)tid;
-#	else
-	pthread_t t;
-	pthread_attr_t attr;
-	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED);
-	if( pthread_create(&t,&attr,callback,param) != 0 ) {
-		pthread_attr_destroy(&attr);
-		return NULL;
-	}
-	pthread_attr_destroy(&attr);
-	return (hl_thread*)t;
-#	endif
-}
-
-HL_PRIM bool hl_thread_pause( hl_thread *t, bool pause ) {
-#	ifdef HL_WIN
-	bool ret;
-	HANDLE h = OpenThread(THREAD_ALL_ACCESS,FALSE,(DWORD)(int_val)t);
-	if( pause ) 
-		ret = ((int)SuspendThread(h)) >= 0;
-	else {
-		int r;
-		while( (r = (int)ResumeThread(h)) > 0 ) {
-		}
-		ret = r == 0;
-	}
-	CloseHandle(h);
-	return ret;
-#	else
-	// TODO : use libthread_db
-	return false;
-#	endif
-}
-
-HL_PRIM int hl_thread_context_size() {
-#	ifdef HL_WIN
-	return (sizeof(CONTEXT) + sizeof(int_val) - 1) / sizeof(int_val);
-#	else
-	return 0;
-#	endif
-}
-
-HL_PRIM int hl_thread_context_index( const char *name ) {
-#	ifdef HL_WIN
-	CONTEXT *c = NULL;
-#	define _ADDR(__r) (int)(((int_val)&c->__r) / sizeof(int_val))
-#	ifdef HL_64
-#		define ADDR(_,r) _ADDR(r)
-#	else
-#		define ADDR(r,_) _ADDR(r)
-#	endif
-	if( strcmp(name,"eip") == 0 )
-		return ADDR(Eip,Rip);
-	if( strcmp(name,"esp") == 0 )
-		return ADDR(Esp,Rsp);
-	return -1;
-#	else
-	return -1;
-#	endif
-#	undef ADDR
-#	undef _ADDR
-}
-
-HL_PRIM bool hl_thread_get_context( hl_thread *t, hl_thread_registers *regs ) {
-#	ifdef HL_WIN
-	HANDLE h = OpenThread(THREAD_ALL_ACCESS,FALSE,(DWORD)(int_val)t);
-	bool ret;
-	CONTEXT *c = (CONTEXT*)regs;
-	c->ContextFlags = CONTEXT_FULL;
-	ret = (bool)GetThreadContext(h,c);
-	CloseHandle(h);
-	return ret;
-#	else
-	return false;
-#	endif
-}
-
-HL_PRIM bool hl_thread_set_context( hl_thread *t, hl_thread_registers *regs ) {
-#	ifdef HL_WIN
-	HANDLE h = OpenThread(THREAD_ALL_ACCESS,FALSE,(DWORD)(int_val)t);
-	bool ret;
-	CONTEXT *c = (CONTEXT*)regs;
-	c->ContextFlags = CONTEXT_FULL;
-	ret = (bool)SetThreadContext(h,c);
-	CloseHandle(h);
-	return ret;
-#	else
-	return false;
-#	endif
-}
+/*
+ * Copyright (C)2005-2016 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#include <hl.h>
+
+#ifndef HL_WIN
+#	include <pthread.h>
+#	include <unistd.h>
+#	include <sys/syscall.h>
+#endif
+
+HL_PRIM hl_thread *hl_thread_current() {
+#	ifdef HL_WIN
+	return (hl_thread*)(int_val)GetCurrentThreadId();
+#	else
+	return (hl_thread*)pthread_self();
+#	endif
+}
+
+HL_PRIM int hl_thread_id() {
+#	ifdef HL_WIN
+	return (int)GetCurrentThreadId();
+#	else
+#	ifdef SYS_gettid
+	return syscall(SYS_gettid);
+#	else
+	hl_error("hl_thread_id() not available for this platform");
+	return -1;
+#	endif
+#	endif
+}
+
+HL_PRIM hl_thread *hl_thread_start( void *callback, void *param, bool withGC ) {
+	if( withGC ) hl_error("Threads with garbage collector are currently not supported");
+#	ifdef HL_WIN
+	DWORD tid;
+	HANDLE h = CreateThread(NULL,0,callback,param,0,&tid);
+	if( h == NULL )
+		return NULL;
+	CloseHandle(h);
+	return (hl_thread*)(int_val)tid;
+#	else
+	pthread_t t;
+	pthread_attr_t attr;
+	pthread_attr_init(&attr);
+	pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED);
+	if( pthread_create(&t,&attr,callback,param) != 0 ) {
+		pthread_attr_destroy(&attr);
+		return NULL;
+	}
+	pthread_attr_destroy(&attr);
+	return (hl_thread*)t;
+#	endif
+}
+
+HL_PRIM bool hl_thread_pause( hl_thread *t, bool pause ) {
+#	ifdef HL_WIN
+	bool ret;
+	HANDLE h = OpenThread(THREAD_ALL_ACCESS,FALSE,(DWORD)(int_val)t);
+	if( pause )
+		ret = ((int)SuspendThread(h)) >= 0;
+	else {
+		int r;
+		while( (r = (int)ResumeThread(h)) > 0 ) {
+		}
+		ret = r == 0;
+	}
+	CloseHandle(h);
+	return ret;
+#	else
+	// TODO : use libthread_db
+	return false;
+#	endif
+}
+
+HL_PRIM int hl_thread_context_size() {
+#	ifdef HL_WIN
+	return (sizeof(CONTEXT) + sizeof(int_val) - 1) / sizeof(int_val);
+#	else
+	return 0;
+#	endif
+}
+
+HL_PRIM int hl_thread_context_index( const char *name ) {
+#	ifdef HL_WIN
+	CONTEXT *c = NULL;
+#	define _ADDR(__r) (int)(((int_val)&c->__r) / sizeof(int_val))
+#	ifdef HL_64
+#		define ADDR(_,r) _ADDR(r)
+#	else
+#		define ADDR(r,_) _ADDR(r)
+#	endif
+	if( strcmp(name,"eip") == 0 )
+		return ADDR(Eip,Rip);
+	if( strcmp(name,"esp") == 0 )
+		return ADDR(Esp,Rsp);
+	return -1;
+#	else
+	return -1;
+#	endif
+#	undef ADDR
+#	undef _ADDR
+}
+
+HL_PRIM bool hl_thread_get_context( hl_thread *t, hl_thread_registers *regs ) {
+#	ifdef HL_WIN
+	HANDLE h = OpenThread(THREAD_ALL_ACCESS,FALSE,(DWORD)(int_val)t);
+	bool ret;
+	CONTEXT *c = (CONTEXT*)regs;
+	c->ContextFlags = CONTEXT_FULL;
+	ret = (bool)GetThreadContext(h,c);
+	CloseHandle(h);
+	return ret;
+#	else
+	return false;
+#	endif
+}
+
+HL_PRIM bool hl_thread_set_context( hl_thread *t, hl_thread_registers *regs ) {
+#	ifdef HL_WIN
+	HANDLE h = OpenThread(THREAD_ALL_ACCESS,FALSE,(DWORD)(int_val)t);
+	bool ret;
+	CONTEXT *c = (CONTEXT*)regs;
+	c->ContextFlags = CONTEXT_FULL;
+	ret = (bool)SetThreadContext(h,c);
+	CloseHandle(h);
+	return ret;
+#	else
+	return false;
+#	endif
+}