Move implicit wsa startup. Renaming of TcpSocketPair.free. Remove wsaCleanup. Added finalizer for implicit close of wsa.

Author: lerno

lib/std/net/os/win32.c3

@@ -1,5 +1,9 @@
 module std::net::os @if(env::WIN32);
-import std::os, std::io, libc;
+import std::os, std::io, libc, std::thread;
+import std::core::mem;
+import std::os::win32;
+
+
 
 const AIFamily PLATFORM_AF_IPX          = 6;
 const AIFamily PLATFORM_AF_APPLETALK    = 16;
@@ -23,6 +27,33 @@ extern fn int listen(NativeSocket, int backlog);
 extern fn NativeSocket accept(NativeSocket, SockAddrPtr address, Socklen_t* address_len);
 extern fn CInt getsockname(NativeSocket socket, SockAddrPtr address, Socklen_t* address_len);
 
+char[408] wsa_data @local;
+int wsa_init @local;
+
+macro void? start_wsa()
+{
+	if (mem::compare_exchange(&wsa_init, 0, 2) == 2)
+	{
+		Win32_WORD version = 0x0202;
+	    CInt wsa_error = win32::wsaStartup(version, &wsa_data);
+		if (wsa_error > 0)
+		{
+			mem::@atomic_store(wsa_init, 0);
+			return os::socket_error()?;
+		}
+		mem::@atomic_store(wsa_init, 1);
+	}
+}
+
+fn void close_wsa() @local @finalizer
+{
+	if (mem::compare_exchange(&wsa_init, 1, 3) == 3)
+	{
+		win32::wsaCleanup();
+		mem::@atomic_store(wsa_init, 0);
+	}
+}
+
 macro bool NativeSocket.is_valid(self)
 {
 	return self != (NativeSocket)(uptr)-1;

lib/std/net/socket_private.c3

@@ -1,5 +1,9 @@
 module std::net @if(os::SUPPORTS_INET);
 import std::time, libc, std::os;
+import std::core::env;
+import std::net::os;
+
+
 
 macro void? apply_sockoptions(sockfd, options) @private
 {
@@ -9,6 +13,9 @@ macro void? apply_sockoptions(sockfd, options) @private
 
 fn Socket? connect_from_addrinfo(AddrInfo* addrinfo, SocketOption[] options) @private
 {
+	$if env::WIN32:
+		os::start_wsa()!;
+	$endif
 	@loop_over_ai(addrinfo; NativeSocket sockfd, AddrInfo* ai)
 	{
 		apply_sockoptions(sockfd, options)!;
@@ -37,6 +44,9 @@ fn bool last_error_is_delayed_connect()
 
 fn Socket? connect_with_timeout_from_addrinfo(AddrInfo* addrinfo, SocketOption[] options, Duration timeout) @private
 {
+	$if env::WIN32:
+		os::start_wsa()!;
+	$endif
 	Clock c = 0;
 	@loop_over_ai(addrinfo; NativeSocket sockfd, AddrInfo* ai)
 	{
@@ -82,6 +92,9 @@ fn Socket? connect_with_timeout_from_addrinfo(AddrInfo* addrinfo, SocketOption[]
 
 fn Socket? connect_async_from_addrinfo(AddrInfo* addrinfo, SocketOption[] options) @private
 {
+	$if env::WIN32:
+		os::start_wsa()!;
+	$endif
 	@loop_over_ai(addrinfo; NativeSocket sockfd, AddrInfo* ai)
 	{
 		apply_sockoptions(sockfd, options)!;
@@ -98,6 +111,9 @@ fn Socket? connect_async_from_addrinfo(AddrInfo* addrinfo, SocketOption[] option
 
 macro void @network_loop_over_ai(network, host, port; @body(fd, ai)) @private
 {
+	$if env::WIN32:
+		os::start_wsa()!;
+	$endif
 	AddrInfo* ai = network.addrinfo(host, port)!;
 	AddrInfo* first = ai;
 	defer os::freeaddrinfo(first);

lib/std/net/tcp.c3

@@ -2,6 +2,10 @@ module std::net::tcp @if(os::SUPPORTS_INET);
 import std::net @public;
 import std::time, libc;
 import std::os::win32;
+import std::core::env;
+import std::net::os;
+
+
 
 typedef TcpSocket = inline Socket;
 typedef TcpServerSocket = inline Socket;
@@ -45,13 +49,19 @@ fn TcpSocket? accept(TcpServerSocket* server_socket)
 {
 	TcpSocket socket;
 	socket.ai_addrlen = socket.ai_addr_storage.len;
+	$if env::WIN32:
+		os::start_wsa()!;
+	$endif
 	socket.sock = os::accept(server_socket.sock, (SockAddrPtr)&socket.ai_addr_storage, &socket.ai_addrlen);
 	if (!socket.sock.is_valid()) return net::ACCEPT_FAILED?;
 	return socket;
 }
 
 fn TcpServerSocket? listen_to(AddrInfo* ai, uint backlog, SocketOption... options)
 {
+	$if env::WIN32:
+		os::start_wsa()!;
+	$endif
 	net::@loop_over_ai(ai; NativeSocket sockfd, AddrInfo* ai_candidate)
 	{
 		net::apply_sockoptions(sockfd, options)!;
@@ -70,10 +80,7 @@ struct TcpSocketPair
 fn TcpSocketPair*? TcpSocketPair.init(&self)
 {
 	$if env::WIN32:
-		Win32_WORD version = 0x0202;
-		char[408] wsa_data;
-		CInt wsa_error = win32::wsaStartup(version, &wsa_data);
-		if (wsa_error > 0) return os::socket_error()?;
+		os::start_wsa()!;
 
 		TcpServerSocket listen_sock = tcp::listen("127.0.0.1", 0, 0)!;
 
@@ -88,10 +95,10 @@ fn TcpSocketPair*? TcpSocketPair.init(&self)
 		char lsb = listen_port_bytes[1];
 		int listen_port = (msb << 8) | lsb;
 
+		defer (void)listen_sock.close();
 		TcpSocket tcp_send_sock = tcp::connect_async("127.0.0.1", listen_port)!;
 		TcpSocket tcp_recv_sock = tcp::accept(&listen_sock)!;
 
-		listen_sock.close()!;
 	$else
 		NativeSocket[2] sockets;
 		isz sockpair_result = os::socketpair(os::AF_UNIX, os::SOCK_STREAM, 0, &sockets);
@@ -108,12 +115,11 @@ fn TcpSocketPair*? TcpSocketPair.init(&self)
 	return self;
 }
 
-fn void? TcpSocketPair.free(&self)
+fn void? TcpSocketPair.destroy(&self)
 {
-	self.send.close()!;
+	{
+		defer catch (void)self.recv.close();
+		self.send.close()!;
+	}
 	self.recv.close()!;
-
-	$if env::WIN32:
-		win32::wsaCleanup();
-	$endif
 }

test/unit/stdlib/net/tcp_socketpair.c3

@@ -5,7 +5,7 @@ fn void test_tcp_sock_pair()
 {
 	tcp::TcpSocketPair sockets;
 	sockets.init()!!;
-	defer sockets.free()!!;
+	defer sockets.destroy()!!;
 
 	String expected = "hello, world!";
 	sockets.send.write(expected)!!;