Changeset 11695 for trunk/FACT++/dim

Timestamp:

07/29/11 09:54:56 (13 years ago)

Author:

tbretz

Message:

Updated from dim_v19r22 to dim_v19r23

Location:

trunk/FACT++/dim

Files:

• DIM_Performance.pdf (modified) ( previous)
• README_v19.txt (modified) (2 diffs)
• dim/dic.hxx (modified) (1 diff)
• dim/dim.h (modified) (1 diff)
• dim/dis.hxx (modified) (1 diff)
• src/diccpp.cxx (modified) (3 diffs)
• src/discpp.cxx (modified) (4 diffs)
• src/examples/test_client.cxx (modified) (2 diffs)
• src/examples/test_server.cxx (modified) (2 diffs)

trunk/FACT++/dim/README_v19.txt

@@ -1 +1 @@
 
-                    DIM version 19.22 Release Notes
+                    DIM version 19.23 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 1922.
+NOTE 3: The Version Number service provided by servers is now set to 1923.
+
+15/07/2011
+Changes for version 19.23:
+    - The new functions:
+        int DimClient::inCallback()
+        int DimServer::inCallback()
+      Can be used to find out if the function is being called in the context of a DIM callback
+      handler (they return 1 if yes, 0 if no).
+    - There was no way to "remove" an errorHandler or exitHandler in C++.
+      Now the following functions accept 0 as parameter:
+        DimClient::addErrorHandler(0)
+        DimServer::addErrorHandler(0)
+        DimServer::addExitHandler(0)
+        DimServer::addClientExitHandler(0)
+      In order to remove them.
+    - The Windows Visual Studio Manifest file distributed since version v19r19 was wrong, so the latest
+      DIM versions did not work on Windows machines without Visual Studio 8 installed - Fixed.
+
 
 21/06/2011

trunk/FACT++/dim/dim/dic.hxx

@@ -462 +462 @@
         static void setNoDataCopy();
         static int getNoDataCopy();
+        static int inCallback();
 };
 

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

@@ -14 +14 @@
 #include "dim_common.h"
 
-#define DIM_VERSION_NUMBER 1922
+#define DIM_VERSION_NUMBER 1923
 
 #define MY_LITTLE_ENDIAN        0x1

trunk/FACT++/dim/dim/dis.hxx

@@ -136 +136 @@
         virtual void serviceHandler() {};
         virtual void commandHandler() {};
+        static int inCallback();
 };
 

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

@@ -1111 +1111 @@
 
         DimCore::inCallback = 2;
-        DimClient::itsCltError->errorHandler(severity, code, msg);
+        if(DimClient::itsCltError != 0)
+                DimClient::itsCltError->errorHandler(severity, code, msg);
         DimCore::inCallback = 0;
 }
@@ -1118 +1119 @@
 void DimClient::addErrorHandler(DimErrorHandler *handler)
 {
-        DimClient::itsCltError = handler;
-        dic_add_error_handler(clt_error_user_routine);
+        if(handler == 0)
+        {
+                dic_add_error_handler(0);
+                DimClient::itsCltError = 0;
+        }
+        else
+        {
+                DimClient::itsCltError = handler;
+                dic_add_error_handler(clt_error_user_routine);
+        }
 }
 
@@ -1207 +1216 @@
         return list;
 }
+
+int DimClient::inCallback()
+{
+        if(DimCore::inCallback)
+                return 1;
+        return 0;
+}

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

@@ -612 +612 @@
 void DimServer::addClientExitHandler(DimClientExitHandler *handler)
 {
-        DimServer::itsClientExit = handler;
-        dis_add_client_exit_handler(client_exit_user_routine);
+        if(handler == 0)
+        {
+                dis_add_client_exit_handler(0);
+                DimServer::itsClientExit = 0;
+        }
+        else
+        {
+                DimServer::itsClientExit = handler;
+                dis_add_client_exit_handler(client_exit_user_routine);
+        }
 }
 
@@ -624 +632 @@
 void DimServer::addExitHandler(DimExitHandler *handler)
 {
-        DimServer::itsExit = handler;
-        dis_add_exit_handler(exit_user_routine);
+        if(handler == 0)
+        {
+                dis_add_exit_handler(0);
+                DimServer::itsExit = 0;
+        }
+        else
+        {
+                DimServer::itsExit = handler;
+                dis_add_exit_handler(exit_user_routine);
+        }
 }
 
 void DimServer::addErrorHandler(DimErrorHandler *handler)
 {
-        DimServer::itsSrvError = handler;
-        dis_add_error_handler(srv_error_user_routine);
+        if(handler == 0)
+        {
+                dis_add_error_handler(0);
+                DimServer::itsSrvError = 0;
+        }
+        else
+        {
+                DimServer::itsSrvError = handler;
+                dis_add_error_handler(srv_error_user_routine);
+        }
 }
 
@@ -686 +710 @@
 }
 
+int DimServer::inCallback()
+{
+        if(DimCore::inCallback)
+                return 1;
+        return 0;
+}
+
 extern "C" {
 static void client_exit_user_routine(int *idp)
@@ -711 +742 @@
 
         DimCore::inCallback = 2;
-        DimServer::itsSrvError->errorHandler(severity, code, msg);
+        if(DimServer::itsSrvError != 0)
+                DimServer::itsSrvError->errorHandler(severity, code, msg);
         DimCore::inCallback = 0;
 }

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

@@ -39 +39 @@
                         index++;
                 }
+                int inCallback = DimClient::inCallback();
+                cout << "infoHandler: In callback "<< inCallback << endl; 
         }
 public :
@@ -83 +85 @@
                 cout << "Current INTVAL : " << servint.getInt() << endl;
                 DimClient::sendCommand("TEST/CMND","UPDATE_STRVAL");
+                int inCallback = DimClient::inCallback();
+                cout << "main: In callback "<< inCallback << endl;
+
+                DimClient::addErrorHandler(0);
         }
         return 0;

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

@@ -183 +183 @@
         }
 */
-
         while(1)
         {
                 sleep(5);
+
 /*
                 while(cmdsvr.hasNext())
@@ -200 +200 @@
                         boolval = 0;
                 ival++;
+                
+                int inCallback = DimServer::inCallback();
+                cout << "main: In callback "<< inCallback << endl; 
                 servint.updateService();
                 if(extraDns)