Changeset 14936 for trunk/FACT++/dim

Timestamp:

02/21/13 13:07:34 (12 years ago)

Author:

tbretz

Message:

Changed to v20r5.

Location:

trunk/FACT++/dim

Files:

• README_v20.txt (modified) (3 diffs)
• dim/dim.h (modified) (1 diff)
• dim/dim_common.h (modified) (2 diffs)
• src/benchmark/benchClient.cxx (modified) (4 diffs)
• src/benchmark/benchServer.cxx (modified) (2 diffs)
• src/dim_thr.c (modified) (2 diffs)
• src/dis_Markus.c (deleted)
• src/dtq.c (modified) (1 diff)
• src/examples/test_server.c (modified) (2 diffs)

trunk/FACT++/dim/README_v20.txt

@@ -1 +1 @@
 
-                    DIM version 20r4 Release Notes
+                    DIM version 20r5 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 2004.
+NOTE 3: The Version Number service provided by servers is now set to 2005.
+
+21/12/2012
+Changes for version 2005:
+    - Moved the WebDID sources to the src directory and the VS settings to the Visual directory
+    - In the Multithreaded (the default) version of DIM, signals are not touched anymore.
+      Before they were masked/unmasked at every dim lock/unlock occurence.
+    - Fixes in WebDID:
+        - Now DIM nodes defined by an IP Address are shown properly (by IP Name)
+        - WebDID looks for the Javascript files in the same directory where its executable is
+          (independently of where it is started from) 
+
 
 21/11/2012
@@ -28 +39 @@
 Changes for version 2003:
     - Added the project settings for Visual Studio 10 in the Visual directory
+    - Added a bin64 directory containing binaries for Windows7 (and 2008 R2) 64 bits
     - Added a prototype webDid. in order to use it:
         - In the same machine when the DIM DNS runs start <dim>/WebDid/webDid

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

@@ -14 +14 @@
 #include "dim_common.h"
 
-#define DIM_VERSION_NUMBER 2004
+#define DIM_VERSION_NUMBER 2005
 
 

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

@@ -124 +124 @@
 #include <unistd.h>
 
-#define DISABLE_AST     sigset_t set, oset; sigemptyset(&set);\
+#define DISABLE_SIG     sigset_t set, oset; sigemptyset(&set);\
                                                 sigaddset(&set,SIGIO);\
                                                 sigaddset(&set,SIGALRM);\
-                                                sigprocmask(SIG_BLOCK,&set,&oset);\
-                                                DIM_LOCK
-#define ENABLE_AST      DIM_UNLOCK sigprocmask(SIG_SETMASK,&oset,0);
+                                                sigprocmask(SIG_BLOCK,&set,&oset);
+#define ENABLE_SIG      sigprocmask(SIG_SETMASK,&oset,0);
 
 #ifdef VxWorks
+#define DISABLE_AST     DISABLE_SIG DIM_LOCK
+#define ENABLE_AST      DIM_UNLOCK ENABLE_SIG
 #define DIM_LOCK taskLock();
 #define DIM_UNLOCK taskUnlock();
@@ -144 +145 @@
 _DIM_PROTOE( void dim_signal_cond,      () );
 
+#define DISABLE_AST     DIM_LOCK
+#define ENABLE_AST      DIM_UNLOCK
 #define DIM_LOCK        dim_lock();
 #define DIM_UNLOCK      dim_unlock();
 
 #else
+#include <time.h>
+#define DISABLE_AST     DISABLE_SIG DIM_LOCK
+#define ENABLE_AST      DIM_UNLOCK ENABLE_SIG
 #define DIM_LOCK
 #define DIM_UNLOCK

trunk/FACT++/dim/src/benchmark/benchClient.cxx

@@ -23 +23 @@
         }
 public :
-        Service(char *name) : DimInfo(name,"--") {/*nReceived = 0;*/}
+        Service(char *name) : DimInfo(name,(char *)"--") {/*nReceived = 0;*/}
 };
 
@@ -34 +34 @@
         char *name, *format, *cltptr, *srvptr, clientName[128];
 
+        if(argc){}
+        if(argc){}
         br.getServices("BENCH_SERVICE_*");
 
@@ -47 +49 @@
         }
         dic_get_id(clientName);
-        if(cltptr = strchr(clientName,'@'))
+        if((cltptr = strchr(clientName,'@')))
                 cltptr++;
         sleep(5);
@@ -55 +57 @@
 
         mps = NReceived/TEST_TIME;
-        if(srvptr = strchr(ServerName,'@'))
+        if((srvptr = strchr(ServerName,'@')))
                 srvptr++;
         cout << "Benchmark from "<< srvptr << " to " << cltptr << " :" << endl;

trunk/FACT++/dim/src/benchmark/benchServer.cxx

@@ -4 +4 @@
 #include <process.h>
 #endif
+#include <stdio.h>
 
 int main(int argc, char *argv[])
@@ -11 +12 @@
         DimService **services;
 
+        if(argc){}
         sscanf(argv[1],"%d",&msgSize);
         sscanf(argv[2],"%d",&nServices);

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

@@ -535 +535 @@
 
 {
+        if(thread_ast){}
+        if(tag){}
         printf("dim_start_thread: not available\n");
         return (dim_long)0;
@@ -541 +543 @@
 int dim_stop_thread(dim_long t_id)
 {
+        if(t_id){}
         printf("dim_stop_thread: not available\n");
         return 0;

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

@@ -844 +844 @@
         sigprocmask(SIG_UNBLOCK, &set, &oset);
         Dtq_sleeping = 1;
-        dtq_start_timer(secs, dtq_sleep_rout, (void *)123);
+        dtq_start_timer(secs, dtq_sleep_rout, (dim_long)123);
     do{
                 pause();

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

@@ -126 +126 @@
         id = dis_add_service( aux, "l:3;d:1;s:1;c:1;s:1;f:1;c:20", &t, sizeof(t), 
                 (void *)0, 0 );
+        if(id){}
         sprintf(aux,"%s/TEST_CMD",argv[1]);
         dis_add_cmnd(aux,"l:3;d:1;s:1;c:1;s:1;f:1;c:20",cmnd_rout, 0);
@@ -178 +179 @@
                 */
                 sleep(10);
+/*
                 dis_update_service(id);
+*/
 /*              
                 for(i = 1; i <= 200; i++)