From c867aa9a8227dc1b30c85155d61d38fe1c57cf45 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20Laferri=C3=A8re?= <alexis.laf@xymus.net>
Date: Sun, 21 Dec 2014 22:37:50 -0500
Subject: [PATCH] lib/socket: minimal update to `SocketObserver` API and note
 some problems
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
---
 lib/socket/socket.nit   |   56 +++++++++++++++++++++++++++++++----------------
 lib/socket/socket_c.nit |    2 ++
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/lib/socket/socket.nit b/lib/socket/socket.nit
index c28a354..26d9937 100644
--- a/lib/socket/socket.nit
+++ b/lib/socket/socket.nit
@@ -17,7 +17,7 @@
 # Socket services
 module socket
 
-import socket_c
+private import socket_c
 intrude import standard::stream
 
 # A general TCP socket, either a `TCPStream` or a `TCPServer`
@@ -251,30 +251,48 @@ class TCPServer
 	end
 end
 
+# A simple set of sockets used by `SocketObserver`
 class SocketSet
-	var sset = new NativeSocketSet
-	fun set(s: TCPSocket) do sset.set(s.socket) end
-	fun is_set(s: TCPSocket): Bool do return sset.is_set(s.socket) end
-	fun zero do sset.zero end
-	fun clear(s: TCPSocket) do sset.clear(s.socket) end
+	private var native = new NativeSocketSet
+
+	init do clear
+
+	# Add `socket` to this set
+	fun add(socket: Socket) do native.set(socket.socket)
+
+	# Remove `socket` from this set
+	fun remove(socket: Socket) do native.clear(socket.socket)
+
+	# Does this set has `socket`?
+	fun has(socket: Socket): Bool do return native.is_set(socket.socket)
+
+	# Clear all sockets from this set
+	fun clear do native.zero
 end
 
+# Service class to manage calls to `select`
 class SocketObserver
-	private var observer: NativeSocketObserver
-	var readset: nullable SocketSet = null
-	var writeset: nullable SocketSet = null
-	var exceptset: nullable SocketSet = null
-	init(read :Bool, write :Bool, except: Bool)
-	do
-		if read then readset = new SocketSet
-		if write then writeset = new SocketSet
-		if except then exceptset = new SocketSet
-		observer = new NativeSocketObserver
+	private var native = new NativeSocketObserver
+
+	var read_set: nullable SocketSet = null
+
+	var write_set: nullable SocketSet = null
+
+	var except_set: nullable SocketSet = null
+
+	init(read: Bool, write: Bool, except: Bool)
+	is old_style_init do
+		if read then read_set = new SocketSet
+		if write then write_set = new SocketSet
+		if except then except_set = new SocketSet
 	end
-	fun select(max: TCPSocket, seconds: Int, microseconds: Int): Bool
+
+	fun select(max: Socket, seconds: Int, microseconds: Int): Bool
 	do
+		# FIXME this implementation (see the call to nullable attributes below) and
+		# `NativeSockectObserver::select` is not stable.
+
 		var timeval = new NativeTimeval(seconds, microseconds)
-		return observer.select(max.socket, readset.sset, writeset.sset, readset.sset, timeval) > 0
+		return native.select(max.socket, read_set.native, write_set.native, except_set.native, timeval) > 0
 	end
 end
-
diff --git a/lib/socket/socket_c.nit b/lib/socket/socket_c.nit
index 2dd14b5..71867b9 100644
--- a/lib/socket/socket_c.nit
+++ b/lib/socket/socket_c.nit
@@ -320,6 +320,8 @@ extern class NativeSocketSet `{ fd_set* `}
 end
 
 class NativeSocketObserver
+	# FIXME this implementation is broken. `reads`, `write` and `except`
+	# are boxed objects, passing them to a C function is illegal.
 	fun select(max: NativeSocket, reads: nullable NativeSocketSet, write: nullable NativeSocketSet,
 			 except: nullable NativeSocketSet, timeout: NativeTimeval): Int `{
 		fd_set *rds, *wts, *exs = NULL;
-- 
1.7.9.5