Changeset 389

Timestamp:

05/17/07 16:58:46 (17 months ago)

Author:

krobillard

Message:

Thune - bzip2 & net config options build in thread_safe branch.

Location:

branches/thune/thread_safe

Files:

• config.t (modified) (1 diff)
• files.c (modified) (2 diffs)
• net.c (modified) (8 diffs)

branches/thune/thread_safe/config.t

@@ -1 +1 @@
 ; Thune Configuration
 
-[ ] bzip2    "Include bzip2 compress/decompress calls"
-[ ] trig     "Include trigonometric math calls"
-[ ] math3d   "Include vector & matrix math calls"
+[x] bzip2    "Include bzip2 compress/decompress calls"
+[x] trig     "Include trigonometric math calls"
+[x] math3d   "Include vector & matrix math calls"
              enable trig
 [ ] dt-code  "Include 'code datatype"
 
-[ ] net      "UDP socket port"
+[x] net      "UDP socket port"
 
 [ ] uds      "Library with datatype & gc system only - no eval"

branches/thune/thread_safe/files.c

@@ -622 +622 @@
     unsigned int blen;
 
-    if( ur_stringSlice( tos, &cpA, &cpB ) && cpA )
+    if( ur_stringSlice( ut, tos, &cpA, &cpB ) && cpA )
     {
         len = cpB - cpA;
@@ -663 +663 @@
 
 
-    if( ! ur_binarySlice( tos, &cpA, &cpB ) || (cpA == 0) )
+    if( ! ur_binarySlice( ut, tos, &cpA, &cpB ) || (cpA == 0) )
         return;
 

branches/thune/thread_safe/net.c

@@ -115 +115 @@
 
         if( ! _makeAddrName( (struct sockaddr_in*) addr->ptr.v,
-                             ur_cstring(hc), ur_int(tos) ) ) 
+                             ur_cstring(ut,hc), ur_int(tos) ) ) 
         {
             ur_throwErr( UR_ERR_SCRIPT, "gethostbyname failed" );
@@ -128 +128 @@
 
 
-static int _openUdpSocket( UThread* ur_thread, int port, int block )
+static int _openUdpSocket( UThread* ut, int port, int block )
 {
     struct sockaddr_in my_addr;
@@ -180 +180 @@
     -1  Url handled, but error occured.
 */
-static int _netOpen( UPortDevice* dev, UThread* ur_thread, UCell* tos )
+static int _netOpen( UPortDevice* dev, UThread* ut, UCell* tos )
 {
     int port;
@@ -196 +196 @@
     if( ! ur_isAWord(res) )
         return 0;
-    if( ur_atom(res) != UR_INTERN("udp", 3) )
+    if( ur_atom(res) != ur_intern("udp", 3) )
         return 0;
 
@@ -232 +232 @@
         }
 
-        if( ! _makeAddrName( &addr, ur_cstring(spec), hostPort ) )
+        if( ! _makeAddrName( &addr, ur_cstring(ut,spec), hostPort ) )
         {
             ur_throwErr( UR_ERR_ACCESS, "gethostbyname failed" );
@@ -244 +244 @@
         int block = 1;
 
-        if( ! ur_userAllows( ur_thread, "Open socket on port %d", port ) )
+        if( ! ur_userAllows( ut, "Open socket on port %d", port ) )
         {
             ur_throwErr( UR_ERR_ACCESS, "User denied open" );
@@ -250 +250 @@
         }
 
-        socket = _openUdpSocket( ur_thread, port, block );
+        socket = _openUdpSocket( ut, port, block );
         if( socket < 0 )
             return -1;
 
-        val = ur_makePort( dev, res ); 
+        val = ur_makePort( ut, dev, res ); 
         if( val )
         {
@@ -390 +390 @@
     if( ur_is(val, UT_INT) )
     {
-        if( ! ur_stringSlice( tos, &buf, &end ) )
+        if( ! ur_stringSlice( ut, tos, &buf, &end ) )
         {
             buf = 0;
-            ur_binarySlice( tos, &buf, &end );
+            ur_binarySlice( ut, tos, &buf, &end );
         }