Changeset 11695 for trunk/FACT++/dim/src

Timestamp:

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

Author:

tbretz

Message:

Updated from dim_v19r22 to dim_v19r23

Location:

trunk/FACT++/dim/src

Files:

• diccpp.cxx (modified) (3 diffs)
• discpp.cxx (modified) (4 diffs)
• examples/test_client.cxx (modified) (2 diffs)
• examples/test_server.cxx (modified) (2 diffs)

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)