Changeset 11070

Timestamp:

06/18/11 23:10:31 (13 years ago)

Author:

tbretz

Message:

Updated from v19r20 to v19r21

Location:

trunk/FACT++/dim

Files:

• README_v19.txt (modified) (2 diffs)
• dim/dim.h (modified) (1 diff)
• src/diccpp.cxx (modified) (5 diffs)
• src/examples/rpc_client.cxx (modified) (1 diff)

trunk/FACT++/dim/README_v19.txt

@@ -1 +1 @@
 
-                    DIM version 19.20 Release Notes
+                    DIM version 19.21 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 1920.
+NOTE 3: The Version Number service provided by servers is now set to 1921.
+
+31/05/2011
+Changes for version 19.21:
+    - Fixed a bug in DimRpcInfo: the timer for the timeout was started too late and sometimes the
+      RPC data was received in the meantime, so the timer was never stopped. 
+
 
 04/05/2011

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

@@ -14 +14 @@
 #include "dim_common.h"
 
-#define DIM_VERSION_NUMBER 1920
+#define DIM_VERSION_NUMBER 1921
 
 #define MY_LITTLE_ENDIAN        0x1

trunk/FACT++/dim/src/diccpp.cxx

@@ -452 +452 @@
         {
                 t->stop();
+//dim_print_date_time();
+//printf("DIM RPC: Stopped Timer, Data Received for %s\n", t->getName());
                 if(DimClient::getNoDataCopy() == 0)
                         memcpy(t->itsData, buf, size);
@@ -504 +506 @@
                         itsData = buf;
                 itsSize = size;
+//dim_print_date_time();
+//printf("DIM RPC: Timer fired, No Data Received for %s\n", itsName);
                 wakeUp = 1;
                 if(itsInit)
@@ -618 +622 @@
                 dim_wait();
         itsWaiting = 1;
+        if(itsTimeout)
+                start(itsTimeout);
+//dim_print_date_time();
+//printf("DIM RPC: Started Timer for %s - %d secs\n", itsName, itsTimeout);
         ret = DimClient::sendCommand(itsNameOut, itsDataOut, size); 
         if(!ret)
         {
+                if(itsTimeout)
+                        stop();
+//dim_print_date_time();
+//printf("DIM RPC: Stopped Timer, Command failed for %s\n", itsName);
 //              rpc_user_routine((int *)&itsTagId, itsNolinkBuf, &itsNolinkSize);
                 rpc_user_routine((long *)&itsHandler, itsNolinkBuf, &itsNolinkSize);
         }
+/*
         else
         {
@@ -629 +642 @@
                         start(itsTimeout);
         }
+*/
 }
 
@@ -655 +669 @@
 //      if(itsTagId)
 //              id_free(itsTagId, SRC_DIC);
+//dim_print_date_time();
+//printf("DIM RPC: Deleting RPC and Timer for %s\n", itsName);
         if(itsId)
                 dic_release_service(itsId);

trunk/FACT++/dim/src/examples/rpc_client.cxx

@@ -87 +87 @@
 
         dim_init();
-        DimClient::setNoDataCopy();
+//      DimClient::setNoDataCopy();
 
-        for(i = 0; i < 10; i++)
+        for(i = 0; i < 1; i++)
         {
                 dim_start_thread(do_work,(void *)i);