Changeset 11881

Timestamp:

08/11/11 16:35:28 (13 years ago)

Author:

tbretz

Message:

Updated to DIM V19r24

Location:

trunk/FACT++/dim

Files:

• README_v19.txt (modified) (2 diffs)
• dim/dim.h (modified) (1 diff)
• src/diccpp.cxx (modified) (1 diff)
• src/dis.c (modified) (1 diff)
• src/examples/test_client.c (modified) (3 diffs)
• src/examples/test_client.cxx (modified) (1 diff)
• src/examples/test_server.cxx (modified) (1 diff)

trunk/FACT++/dim/README_v19.txt

@@ -1 +1 @@
 
-                    DIM version 19.23 Release Notes
+                    DIM version 19.24 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 1923.
+NOTE 3: The Version Number service provided by servers is now set to 1924.
+
+08/08/2011
+Changes for version 19.24:
+    - The funtion DimInfo::getFormat() never return the correct format of a service, if the first time
+      it was called, the service was not available, i.e. when called inside a "no_link" callback - Fixed.
+    - Deleting the last service of a server or stopping a server could generate "Invalid Service Id"
+      messages from the service that updates DID - Fixed.
+
 
 15/07/2011

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

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

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

@@ -110 +110 @@
 {
         char *def;
+        int len = 0, new_len;
 
         if(itsFormat)
         {
-                return itsFormat;
+                len = strlen(itsFormat)+1;
+                if(len > 1)
+                        return itsFormat;
         }
         def = dic_get_format(itsId);
-
-        itsFormat = new char[strlen(def)+1];
+        new_len = strlen(def)+1;
+        if(new_len > len)
+        {
+                if(itsFormat)
+                        delete[] itsFormat;
+                itsFormat = new char[strlen(def)+1];
+        }
         strcpy(itsFormat, def);
         return itsFormat;

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

@@ -1015 +1015 @@
 {
         dnsp->updating_service_list = 0;
-        dis_update_service(dnsp->dis_service_id);
+        if(dnsp->dis_service_id)
+                dis_update_service(dnsp->dis_service_id);
 }
 

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

@@ -64 +64 @@
 int *tag, *size;
 {
+        char *format;
 
+        format = dic_get_format(0);
+        printf("Received format = %s %08x, %d\n",format, format, *size);
         if(*tag == 1100)
         {
@@ -91 +94 @@
         }
         else
-                printf("%s Received %s for Service%03d\n",client_str,buf, *tag);
+                printf("%s Received %s %08X for Service%03d\n",client_str,buf, buf,*tag);
 
 /*
@@ -121 +124 @@
         {
                 sprintf(str,"%s/Service_%03d",argv[2],i);
+//              dic_info_service( str, TIMED, 10, 0, 0, rout, i,
+//                        "No Link", 8 );
                 dic_info_service( str, TIMED, 10, 0, 0, rout, i,
-                          "No Link", 8 );
+                          NULL, 0 );
         }
         

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

@@ -30 +30 @@
                 int index = 0;
                 char **services;
+                char *format;
 //              cout << "Dns Node = " << DimClient::getDnsNode() << endl;
-                cout << "Received STRVAL : " << getString() << endl;
+                format = getFormat();
+                cout << "Received STRVAL : " << getString() << "format = " << format << endl;
                 services = DimClient::getServerServices();
                 cout<< "from "<< DimClient::getServerName() << " services:" << endl;

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

@@ +1 @@
+//============================================================================
+// Name        : emptyDimFormat.cpp
+// Author      : Etienne Lyard etienne.lyard@unige.ch
+// Version     : 00
+// Copyright   :
+// Description : Demonstrates the occurence of an empty Dim format from the client's perspective
+//============================================================================
+/*
+#include <dic.hxx>
+#include <dis.hxx>
+#include <iostream>
+using namespace std;
+
+class EmptyServiceSubscriber : public DimInfo
+{
+    DimStampedInfo* info;
+        int noLink;
+public:
+    EmptyServiceSubscriber()
+    {
+//        info = new DimStampedInfo("TIME/EMPTY", const_cast<char*>(""), this);
+                noLink = -1;
+        info = new DimStampedInfo("TIME/EMPTY", noLink, this);
+    }
+    void infoHandler()
+    {
+        DimInfo* I = getInfo();
+                int data;
+        if (I == info)
+                {
+                        data = I->getInt();
+//              cout << "EMPTY SERVICE UPDATED. " << "Format: " << I->getFormat() << endl;
+                        cout << "EMPTY SERVICE UPDATED. " << data << " Format: " << I->getFormat() << endl;
+                }
+    }
+};
+
+int main(int, const char**)
+{
+    DimServer::start("TIME");
+
+    int emptyFormatVariable = 0;
+    DimService* emptyFormatService = new DimService("TIME/EMPTY", "I:1", &emptyFormatVariable, sizeof(long));
+    EmptyServiceSubscriber mySubscriber;
+    //The three lines below create (most of the time) an empty format on the client side.
+    //We must be able to deal with such cases in our framework because services can be stopped and re-spawned at any time
+    delete emptyFormatService;
+    usleep(1000000);
+    emptyFormatService = new DimService("TIME/EMPTY", "I:1", &emptyFormatVariable, sizeof(long));
+
+    while (1)
+    {
+        emptyFormatService->updateService();
+        usleep(1000000);
+    }
+
+        return 0;
+}
+*/
+
 #include <iostream>
 #include <dis.hxx>