Changeset 13339

Timestamp:

04/12/12 20:05:44 (12 years ago)

Author:

tbretz

Message:

Updated to v19r31

Location:

trunk/FACT++/dim

Files:

• README_v19.txt (modified) (2 diffs)
• dim/dim.h (modified) (1 diff)
• src/dic.c (modified) (7 diffs)
• src/dis.c (modified) (2 diffs)
• src/examples/test_client.c (modified) (1 diff)
• src/tcpip.c (modified) (2 diffs)

trunk/FACT++/dim/README_v19.txt

@@ -1 +1 @@
 
-                    DIM version 19.30 Release Notes
+                    DIM version 19.31 Release Notes
 
 Notes 1 and 2 for Unix Users only
@@ -17 +17 @@
                 Dns </dev/null >& dns.log &
 
-NOTE 3: The Version Number service provided by servers is now set to 1930.
+NOTE 3: The Version Number service provided by servers is now set to 1931.
+
+30/03/2012
+Changes for version 19.31:
+    - changed dna_write to dna_write_nowait for servers when removing a service and for clients
+      when releasing and subscribing to a service. Dna_write cannot be used for the same connection
+      as dna_write_nowait as it will mingle the packets.
+    - Removed more compiler warnings.
 
 14/03/2012

trunk/FACT++/dim/dim/dim.h

@@ -14 +14 @@
 #include "dim_common.h"
 
-#define DIM_VERSION_NUMBER 1930
+#define DIM_VERSION_NUMBER 1931
 
 #define MY_LITTLE_ENDIAN        0x1

trunk/FACT++/dim/src/dic.c

@@ -91 +91 @@
 {
         dim_print_date_time();
-        printf(" - Bad ID received from server -> Packet received:\n");
+        printf("Bad ID received from server -> Packet received:\n");
         printf("\tpacket->size = %d\n",vtohl(packet->size));
         printf("\tpacket->service_id = %d\n",vtohl(packet->service_id));
@@ -160 +160 @@
                         dna_get_node_task(conn_id, node, task);
                         dim_print_date_time();
-                        printf(" - Conn %d: Server %s on node %s Disconnected\n",
+                        printf("Conn %d: Server %s on node %s Disconnected\n",
                                 conn_id, task, node);
                         fflush(stdout);
@@ -362 +362 @@
                         dna_get_node_task(conn_id, node, task);
                         dim_print_date_time();
-                        printf(" - Conn %d: Server %s on node %s Connected\n",
+                        printf("Conn %d: Server %s on node %s Connected\n",
                                 conn_id, task, node);
                         fflush(stdout);
@@ -1029 +1029 @@
                 dic_packet->service_id = htovl(service_id);
                 dic_packet->size = htovl(DIC_HEADER);
-                dna_write( conn_id, dic_packet, DIC_HEADER );
+                dna_write_nowait( conn_id, dic_packet, DIC_HEADER );
                 release_service( servp );
                 break;
@@ -1442 +1442 @@
                         {
                                 dim_print_date_time();
-                                printf(" - Conn %d, Server %s on node %s Connecting\n",
+                                printf("Conn %d, Server %s on node %s Connecting\n",
                                         conn_id, dic_connp->task_name, dic_connp->node_name);
                                 fflush(stdout);
@@ -1478 +1478 @@
                                 {
                                         dim_print_date_time();
-                                        printf(" - Failed connecting to Server %s on node %s port %d\n",
+                                        printf("Failed connecting to Server %s on node %s port %d\n",
                                                 task_name, node_name, port);
                                         fflush(stdout);
@@ -1830 +1830 @@
         dic_packet->format = htovl(MY_FORMAT);
         dic_packet->size = htovl(DIC_HEADER);
-        ret = dna_write(conn_id, dic_packet, DIC_HEADER);
+        ret = dna_write_nowait(conn_id, dic_packet, DIC_HEADER);
+        if(!ret)
+        {
+                dim_print_date_time();
+                printf(" Client Sending Service Request: Couldn't write to Conn %3d : Server %s@%s\n",
+                        conn_id, Net_conns[conn_id].task, Net_conns[conn_id].node);
+                fflush(stdout);
+        }
         return(ret);
 }

trunk/FACT++/dim/src/dis.c

@@ -1516 +1516 @@
                                         Net_conns[conn_id].task, Net_conns[conn_id].node);
                         }
-                }
-                fflush(stdout);
+                        fflush(stdout);
+                }
                 if(reqp->delay_delete > 1)
                 {
@@ -1560 +1560 @@
         dis_packet->service_id = htovl(service_id);
         dis_packet->size = htovl(DIS_HEADER);
-        if( !dna_write(reqp->conn_id, dis_packet, DIS_HEADER) ) 
-        {
+        if( !dna_write_nowait(reqp->conn_id, dis_packet, DIS_HEADER) ) 
+        {
+                dim_print_date_time();
+                printf(" Server Removing Service: Couldn't write to Conn %3d : Client %s@%s\n",
+                        reqp->conn_id, Net_conns[reqp->conn_id].task, Net_conns[reqp->conn_id].node);
+                fflush(stdout);
                 release_conn(reqp->conn_id, 0, 0);
         }

trunk/FACT++/dim/src/examples/test_client.c

@@ -57 +57 @@
 {
         if(tag){}
-        printf("Received VERSION %x, %d\n", (long)buf, *size);
+        printf("Received VERSION %lx, %d\n", (long)buf, *size);
 }
 

trunk/FACT++/dim/src/tcpip.c

@@ -67 +67 @@
 #include <errno.h>
 #include <netdb.h>
+
 #endif
 
@@ -890 +891 @@
         int path, val, ret_code, ret;
         int a,b,c,d;
-        unsigned char ipaddr[4];
+/* Fix for gcc 4.6 "dereferencing type-punned pointer will break strict-aliasing rules"?!*/
+        unsigned char ipaddr_buff[4];
+        unsigned char *ipaddr = ipaddr_buff;
         int host_number = 0;