Changeset 538

Timestamp:

02/07/09 15:41:55 (3 years ago)

Author:

mooneer

Message:

Added socket|eof and removed timeouts from readline and read() (credit: Michael Edgar)

Location:

interpreter/trunk/modules

Files:

• System/network/socket.c (modified) (5 diffs)
• all_modules.kt (modified) (1 diff)

interpreter/trunk/modules/System/network/socket.c

@@ -175 +175 @@
     kite_vm_return(thd, rval);
 }
+/*************************************************************************
+ * Check if the socket has data.
+****************************************************************************/
+KITE_CLASS_METHOD(Socket_eof) {
+  kite_object_t *timeout;
+  struct timeval timeout_struct;
+  fd_set socklist;
+  
+  int can_read;
+
+  KITE_GET_METHOD_ARGUMENT(timeout, 1);
+  if (timeout == NULL || timeout->type == OBJ_NULL) {
+    timeout_struct.tv_sec = 1;
+    timeout_struct.tv_usec = 0;
+  }
+  else
+  {
+    timeout_struct.tv_sec = KITE_GET_INTEGER(timeout) / 1000;
+    timeout_struct.tv_usec = (float)(KITE_GET_INTEGER(timeout) % 1000) / 1000.0f;
+  }
+  
+  CHECK_SOCKET_OPEN;
+  
+  FD_ZERO(&socklist);
+  FD_SET(KITE_GET_INTEGER(this),&socklist);
+  can_read = select(FD_SETSIZE,&socklist,NULL,NULL,&timeout_struct);
+  if (can_read <= 0) {
+    kite_vm_return(thd, kite_new_boolean(thd,TRUE));
+    return;
+  }
+  else {
+    kite_vm_return(thd, kite_new_boolean(thd,FALSE));
+    return;
+  }
+}   
 /*****************************************************************************
  * Read up to the given number of bytes
@@ -183 +218 @@
     kite_object_t *rval;
     char *buf = calloc(bytes->builtin_data.intvalue + 1, 1);
-    int ret, can_read;
-    struct timeval timeout;
-    fd_set socklist;
+    int ret;
     
     CHECK_SOCKET_OPEN;
-    
-    timeout.tv_sec = 1;
-    timeout.tv_usec = 0;
-    
-    FD_ZERO(&socklist);
-    FD_SET(KITE_GET_INTEGER(this),&socklist);
-    can_read = select(FD_SETSIZE,&socklist,NULL,NULL,&timeout);
-    if (can_read <= 0) {
-      free(buf);
-      kite_vm_return(thd, kite_new_null(thd));
-      return;
-    }
+
     ret = read(KITE_GET_INTEGER(this), buf, KITE_GET_INTEGER(bytes));
     if (ret < 0 && errno != EAGAIN) {
@@ -227 +249 @@
     int ret, idx = 0;
     kite_object_t *rval;
-    int can_read;
-    struct timeval timeout;
-    fd_set socklist;
+    // int can_read;
+    // struct timeval timeout;
+    // fd_set socklist;
 
     CHECK_SOCKET_OPEN;
@@ -235 +257 @@
 
     buf = calloc(1, 1);
-    
-    timeout.tv_sec = 1;
-    timeout.tv_usec = 0;
-    
-    FD_ZERO(&socklist);
-    FD_SET(KITE_GET_INTEGER(this),&socklist);
-    can_read = select(FD_SETSIZE,&socklist,NULL,NULL,&timeout);
-    if (can_read <= 0) {
-      free(buf);
-      kite_vm_return(thd, kite_new_null(thd));
-      return;
-    }
-    
+
     do {
         ret = read(KITE_GET_INTEGER(this), &buf[idx], 1);
@@ -554 +564 @@
                                   "Listen for connections on given socket.", 1,
                                   "queue", "The size of the listen queue."));
+    kite_add_method(thread, newclass, "eof", 
+        kite_new_method_compiled_with_docs(thread, Socket_eof, 
+                                  "Checks if the socket has any more data to read. 1 second timeout.", 0));
+    kite_add_method(thread, newclass, "eof", 
+      kite_new_method_compiled_with_docs(thread, Socket_eof, 
+                                "Checks if the socket has any more data to read. Timeout in parameter.", 1,
+                                "timeout","How long (in milliseconds) to wait before timing out and returning TRUE."));                                                                    
     kite_add_method(thread, newclass, "read", 
         kite_new_method_compiled_with_docs(thread, Socket_read, 

interpreter/trunk/modules/all_modules.kt

@@ -30 +30 @@
 import "System.boolean";
 import "System.collections";
+import "System.collections.array";
 import "System.date";
 import "System.date.hires";