Changeset 14575 for trunk/FACT++

Timestamp:

11/07/12 10:47:40 (12 years ago)

Author:

tbretz

Message:

Updated to v20r01.

Location:

trunk/FACT++/dim

Files:

• README_v19.txt (modified) (2 diffs)
• README_v20.txt (added)
• dim/dic.h (modified) (1 diff)
• dim/dim.h (modified) (4 diffs)
• dim/dim_common.h (modified) (3 diffs)
• dim/dis.h (modified) (2 diffs)
• dim/dis.hxx (modified) (3 diffs)
• src/dic.c (modified) (12 diffs)
• src/diccpp.cxx (modified) (14 diffs)
• src/dim_jni.c (modified) (16 diffs)
• src/dim_thr.c (modified) (5 diffs)
• src/dis.c (modified) (28 diffs)
• src/discpp.cxx (modified) (10 diffs)
• src/dtq.c (modified) (4 diffs)
• src/examples/rpc_client.cxx (modified) (2 diffs)
• src/examples/test_client.c (modified) (1 diff)
• src/examples/test_server.c (modified) (1 diff)
• src/open_dns.c (modified) (8 diffs)

trunk/FACT++/dim/README_v19.txt

@@ -1 +1 @@
 
-                    DIM version 19.38 Release Notes
+                    DIM version 19.39 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 1938.
+NOTE 3: The Version Number service provided by servers is now set to 1939.
+
+04/10/2012
+Changes for version 19.39:
+    - Unfortunately Windows, unlike Linux, does not use LP64 convention for 64 bits, 
+      i.e. the type long is a 32 bit variable (?!?!?!)
+      So created a dim_long type which can always hold a pointer
+ 
 
 09/08/2012

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

@@ -25 +25 @@
                                     int req_timeout, void *service_address,
                                     int service_size, void (*usr_routine)(void*, void*, int*),
-                                    long tag, void *fill_addr, int fill_size) );
+                                    dim_long tag, void *fill_addr, int fill_size) );
 _DIM_PROTOE( unsigned dic_info_service_stamped, (char *service_name, int req_type,
                                     int req_timeout, void *service_address,
                                     int service_size, void (*usr_routine)(void*, void*, int*),
-                                    long tag, void *fill_addr, int fill_size) );
+                                    dim_long tag, void *fill_addr, int fill_size) );
 _DIM_PROTOE( int dic_cmnd_callback,      (char *service_name, void *service_address,
                                     int service_size, void (*usr_routine)(void*, int*),
-                                    long tag) );
+                                    dim_long tag) );
 _DIM_PROTOE( int dic_cmnd_service,      (char *service_name, void *service_address,
                                     int service_size) );

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

@@ -14 +14 @@
 #include "dim_common.h"
 
-#define DIM_VERSION_NUMBER 1938
+#define DIM_VERSION_NUMBER 2001
 
 
@@ -375 +375 @@
         int time_left;
         void (*user_routine)();
-        long tag;
+        dim_long tag;
 } TIMR_ENT;
 
@@ -471 +471 @@
         int fill_size;
         void (*user_routine)();
-        long tag;
+        dim_long tag;
         TIMR_ENT *timer_ent;
         int conn_id;
@@ -517 +517 @@
 _DIM_PROTOE( int dtq_delete,          (int queue_id) );
 _DIM_PROTOE( TIMR_ENT *dtq_add_entry, (int queue_id, int time,
-                                  void (*user_routine)(), long tag) );
+                                  void (*user_routine)(), dim_long tag) );
 _DIM_PROTOE( int dtq_clear_entry,     (TIMR_ENT *entry) );
 _DIM_PROTOE( int dtq_rem_entry,       (int queue_id, TIMR_ENT *entry) );

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

@@ -43 +43 @@
 #endif
 
-#ifdef WIN32
+#if defined (_WIN64)
 typedef __int64         longlong;
+typedef longlong dim_long;
+#elif defined(WIN32)
+typedef __int64         longlong;
+typedef long    dim_long;
 #elif defined(__linux__)
 typedef long long int longlong;
+typedef long dim_long;
 #else
 #include <sys/types.h> 
 typedef int64_t longlong;
+typedef long dim_long;
 #endif
 
@@ -182 +188 @@
 _DIM_PROTOE( int dim_set_scheduler_class,               (int sched_class) );
 _DIM_PROTOE( int dim_get_scheduler_class,               (int *sched_class) );
-_DIM_PROTOE( long dim_start_thread,    (void(*rout)(void*), void *tag) );
+_DIM_PROTOE( dim_long dim_start_thread,    (void(*rout)(void*), void *tag) );
 _DIM_PROTOE( int dic_set_dns_node,              (char *node) );
 _DIM_PROTOE( int dic_get_dns_node,              (char *node) );
@@ -192 +198 @@
 _DIM_PROTOE( int dis_get_dns_port,              () );
 _DIM_PROTOE( void dim_stop,                             () );
-_DIM_PROTOE( int dim_stop_thread,               (long tid) );
-_DIM_PROTOE( long dis_add_dns,          (char *node, int port) );
-_DIM_PROTOE( long dic_add_dns,          (char *node, int port) );
+_DIM_PROTOE( int dim_stop_thread,               (dim_long tid) );
+_DIM_PROTOE( dim_long dis_add_dns,              (char *node, int port) );
+_DIM_PROTOE( dim_long dic_add_dns,              (char *node, int port) );
 _DIM_PROTOE( int dim_get_env_var,               (char *env_var, char *value, int value_size) );
 _DIM_PROTOE( int dim_set_write_buffer_size,             (int bytes) );

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

@@ -27 +27 @@
 _DIM_PROTOE( int dis_start_serving,    (char *task_name) );
 _DIM_PROTOE( void dis_stop_serving,    () );
-_DIM_PROTOE( int dis_get_next_cmnd,    (long *tag, int *buffer, int *size ) );
+_DIM_PROTOE( int dis_get_next_cmnd,    (dim_long *tag, int *buffer, int *size ) );
 _DIM_PROTOE( int dis_get_client,       (char *name ) );
 _DIM_PROTOE( int dis_get_conn_id,      () );
 _DIM_PROTOE( unsigned dis_add_service, (char *service_name, char *service_type,
                                    void *service_address, int service_size,
-                                   void (*usr_routine)(void*,void**,int*,int*), long tag) );
+                                   void (*usr_routine)(void*,void**,int*,int*), dim_long tag) );
 _DIM_PROTOE( unsigned dis_add_cmnd,        (char *service_name, char *service_type,
-                                   void (*usr_routine)(void*,void*,int*), long tag) );
+                                   void (*usr_routine)(void*,void*,int*), dim_long tag) );
 _DIM_PROTOE( void dis_add_client_exit_handler,(void (*usr_routine)(int*)) );
 _DIM_PROTOE( void dis_set_client_exit_handler,(int conn_id, int tag) );
@@ -54 +54 @@
 _DIM_PROTOE( char *dis_get_error_services,      () );
 _DIM_PROTOE( char *dis_get_client_services,     (int conn_id) );
-_DIM_PROTOE( int dis_start_serving_dns,         (long dns_id, char *task_name/*, int *id_list*/) );
-_DIM_PROTOE( void dis_stop_serving_dns,         (long dns_id) );
-_DIM_PROTOE( unsigned dis_add_service_dns,      (long dns_id, char *service_name, char *service_type,
+_DIM_PROTOE( int dis_start_serving_dns,         (dim_long dns_id, char *task_name/*, int *id_list*/) );
+_DIM_PROTOE( void dis_stop_serving_dns,         (dim_long dns_id) );
+_DIM_PROTOE( unsigned dis_add_service_dns,      (dim_long dns_id, char *service_name, char *service_type,
                                    void *service_address, int service_size,
-                                   void (*usr_routine)(void*,void**,int*,int*), long tag) );
-_DIM_PROTOE( unsigned dis_add_cmnd_dns,         (long dns_id, char *service_name, char *service_type,
-                               void (*usr_routine)(void*,void*,int*), long tag) );
+                                   void (*usr_routine)(void*,void**,int*,int*), dim_long tag) );
+_DIM_PROTOE( unsigned dis_add_cmnd_dns,         (dim_long dns_id, char *service_name, char *service_type,
+                               void (*usr_routine)(void*,void*,int*), dim_long tag) );
 _DIM_PROTOE( int dis_get_n_clients,     (unsigned service_id) );
 _DIM_PROTOE( int dis_get_timestamp,     (unsigned service_id, 

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

@@ -64 +64 @@
         ~DimServerDns();
         void init(const char *node, int port);
-        long getDnsId();
+        dim_long getDnsId();
         void setName(const char *name);
         char *getName();
@@ -76 +76 @@
         char *itsNode;
         int itsPort;
-        long itsDnsId;
+        dim_long itsDnsId;
         char *itsName;
         int autoStart;
@@ -119 +119 @@
         static int setDnsNode(const char *node);
         static int setDnsNode(const char *node, int port);
-        static long addDns(const char *node, int port);
-        static void stopDns(long dnsid);
+        static dim_long addDns(const char *node, int port);
+        static void stopDns(dim_long dnsid);
         static char *getDnsNode();
         static int getDnsPort();

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

@@ -64 +64 @@
                                     int req_timeout, void *service_address,
                                     int service_size, void (*usr_routine)(void*,void*,int*),
-                                    long tag, void *fill_addr, int fill_size, int stamped) );
+                                    dim_long tag, void *fill_addr, int fill_size, int stamped) );
 _DIM_PROTO( int request_command,      (char *service_name, void *service_address,
                                     int service_size, void (*usr_routine)(void*,int*),
-                                    long tag, int stamped) );
+                                    dim_long tag, int stamped) );
 _DIM_PROTO( DIC_SERVICE *insert_service, (int type, int timeout, char *name,
                                   int *address, int size, void (*routine)(),
-                                  long tag, int *fill_addr, int fill_size,
+                                  dim_long tag, int *fill_addr, int fill_size,
                                   int pending, int stamped ) );
 _DIM_PROTO( void modify_service, (DIC_SERVICE *servp, int timeout,
                                   int *address, int size, void (*routine)(),
-                                  long tag, int *fill_addr, int fill_size, int stamped) );
+                                  dim_long tag, int *fill_addr, int fill_size, int stamped) );
 _DIM_PROTO( DIC_SERVICE *locate_command, (char *serv_name) );
 _DIM_PROTO( DIC_SERVICE *locate_pending, (char *serv_name) );
@@ -586 +586 @@
 
 unsigned dic_info_service( char *serv_name, int req_type, int req_timeout, void *serv_address,
-                           int serv_size, void (*usr_routine)(), long tag, void *fill_addr, int fill_size )
+                           int serv_size, void (*usr_routine)(), dim_long tag, void *fill_addr, int fill_size )
 {
         unsigned ret;
@@ -598 +598 @@
 
 unsigned dic_info_service_stamped( char *serv_name, int req_type, int req_timeout, void *serv_address,
-                           int serv_size, void (*usr_routine)(), long tag, void *fill_addr, int fill_size )
+                           int serv_size, void (*usr_routine)(), dim_long tag, void *fill_addr, int fill_size )
 {
         unsigned ret;
@@ -610 +610 @@
 
 unsigned request_service( char *serv_name, int req_type, int req_timeout, void *serv_address,
-                           int serv_size, void (*usr_routine)(), long tag, void *fill_addr, int fill_size, int stamped )
+                           int serv_size, void (*usr_routine)(), dim_long tag, void *fill_addr, int fill_size, int stamped )
 {
         register DIC_SERVICE *servp;
@@ -701 +701 @@
 
 int dic_cmnd_callback( char *serv_name, void *serv_address, int serv_size, 
-                                          void (*usr_routine)(), long tag )
+                                          void (*usr_routine)(), dim_long tag )
 {
         int ret;
@@ -711 +711 @@
 
 int dic_cmnd_callback_stamped( char *serv_name, void *serv_address, int serv_size, 
-                                          void (*usr_routine)(), long tag )
+                                          void (*usr_routine)(), dim_long tag )
 {
         int ret;
@@ -721 +721 @@
 
 int request_command(char *serv_name, void *serv_address, int serv_size, 
-                                          void (*usr_routine)(), long tag, int stamped)
+                                          void (*usr_routine)(), dim_long tag, int stamped)
 {
         int conn_id, ret;
@@ -795 +795 @@
 
 DIC_SERVICE *insert_service( int type, int timeout, char *name, int *address, int size, 
-                                                        void (*routine)(), long tag, int *fill_addr, int fill_size, 
+                                                        void (*routine)(), dim_long tag, int *fill_addr, int fill_size, 
                                                         int pending, int stamped)
 {
@@ -869 +869 @@
 
 void modify_service( DIC_SERVICE *servp, int timeout, int *address, int size, void (*routine)(), 
-                         long tag, int *fill_addr, int fill_size, int stamped)
+                         dim_long tag, int *fill_addr, int fill_size, int stamped)
 {
         int *fillp;
@@ -1153 +1153 @@
 int locate_service( DIC_SERVICE *servp )
 {
-        extern int open_dns(long, void (*)(), void (*)(), int, int, int);
+        extern int open_dns(dim_long, void (*)(), void (*)(), int, int, int);
 
         if(!strcmp(servp->serv_name,"DIS_DNS/SERVER_INFO"))
@@ -1517 +1517 @@
                         if(tmout == 0)
                                 tmout = 1;
-                        dtq_start_timer(tmout, retry_bad_connection, (long)bad_connp);
+                        dtq_start_timer(tmout, retry_bad_connection, (dim_long)bad_connp);
                         if(( servp->type == COMMAND )||( servp->type == ONCE_ONLY ))
                                 return(0);
@@ -1987 +1987 @@
                 id = id_get((void *)itemp, SRC_DIC);
 */
-                dtq_start_timer(0, do_cmnd_callback, (long)itemp);
+                dtq_start_timer(0, do_cmnd_callback, (dim_long)itemp);
 /*
                 (servp->user_routine)( &servp->tag, &ret );

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

@@ -20 +20 @@
         if(DimClient::getNoDataCopy() == 0)
         {
-                if(!t->itsDataSize)
-                {
-                        t->itsData = new char[*size];
-                        t->itsDataSize = *size;
-                }
-                else if(t->itsDataSize < *size)
-                {
-                        delete[] (char *)(t->itsData);
-                        t->itsData = new char[*size];
-                        t->itsDataSize = *size;
-                }
-                memcpy(t->itsData, buf, *size);
+                if(*size > 0)
+                {
+                        if(!t->itsDataSize)
+                        {
+                                t->itsData = new char[*size];
+                                t->itsDataSize = *size;
+                        }
+                        else if(t->itsDataSize < *size)
+                        {
+                                delete[] (char *)(t->itsData);
+                                t->itsData = new char[*size];
+                                t->itsDataSize = *size;
+                        }
+                        memcpy(t->itsData, buf, *size);
+                }
+                else if (*size == 0)
+                {
+                        if(t->itsDataSize)
+                        {
+                                delete[] (char *)(t->itsData);
+                                t->itsDataSize = 0;
+                        }
+                        t->itsData = buf;
+                }
         }
         else
@@ -83 +95 @@
         itsId = dic_info_service(itsName,itsType,itsTime, 0, 0,
 //              user_routine, itsTagId, 
-                user_routine, (long)this, 
+                user_routine, (dim_long)this, 
                 itsNolinkBuf, itsNolinkSize);
         ENABLE_AST
@@ -134 +146 @@
         itsId = dic_info_service(itsName,itsType,itsTime, 0, 0,
 //              user_routine, itsTagId, 
-                user_routine, (long)this, 
+                user_routine, (dim_long)this, 
                 itsNolinkBuf, itsNolinkSize);
 }
@@ -218 +230 @@
         itsId = dic_info_service_stamped(itsName,itsType,itsTime, 0, 0,
 //              user_routine, itsTagId, 
-                user_routine, (long)this, 
+                user_routine, (dim_long)this, 
                 itsNolinkBuf, itsNolinkSize);
         ENABLE_AST
@@ -276 +288 @@
         itsId = dic_info_service_stamped(itsName,itsType,itsTime, 0, 0,
 //              user_routine, itsTagId, 
-                user_routine, (long)this, 
+                user_routine, (dim_long)this, 
                 itsNolinkBuf, itsNolinkSize);
         ENABLE_AST
@@ -332 +344 @@
 //      t = (DimCurrentInfo *)id_get_ptr(id, SRC_DIC);
         t = * (DimCurrentInfo **)tagp;
-        if(!t->itsDataSize)
-        {
-                t->itsData = new char[*size];
-                t->itsDataSize = *size;
-        }
-        else if(t->itsDataSize < *size)
-        {
-                delete[] (char *)(t->itsData);
-                t->itsData = new char[*size];
-                t->itsDataSize = *size;
-        }
-        memcpy(t->itsData, buf, *size);
+        if(*size > 0)
+        {
+                if(!t->itsDataSize)
+                {
+                        t->itsData = new char[*size];
+                        t->itsDataSize = *size;
+                }
+                else if(t->itsDataSize < *size)
+                {
+                        delete[] (char *)(t->itsData);
+                        t->itsData = new char[*size];
+                        t->itsDataSize = *size;
+                }
+                memcpy(t->itsData, buf, *size);
+        }
+        else if (*size == 0)
+        {
+                if(t->itsDataSize)
+                {
+                        delete[] (char *)(t->itsData);
+                        t->itsDataSize = 0;
+                }
+                t->itsData = buf;
+        }
         t->itsSize = *size;
         t->wakeUp = 1;
@@ -390 +414 @@
         dic_info_service(itsName,ONCE_ONLY,timeout, 0, 0,
 //              data_user_routine, itsTagId, 
-                data_user_routine, (long)this, 
+                data_user_routine, (dim_long)this, 
                 itsNolinkBuf, itsNolinkSize);
 }
@@ -464 +488 @@
                 dic_cmnd_callback(name, data, datasize, 
 //                      cmnd_done, id);
-                        cmnd_done, (long)this);
+                        cmnd_done, (dim_long)this);
                 while(!wakeUp)
                 {
@@ -503 +527 @@
         if(DimClient::getNoDataCopy() == 0)
         {
-                if(!t->itsDataSize)
-                {
-                        t->itsData = new char[size];
-                        t->itsDataSize = size;
-                }
-                else if(t->itsDataSize < size)
-                {
-                        delete[] (char *)(t->itsData);
-                        t->itsData = new char[size];
-                        t->itsDataSize = size;
+                if(size > 0)
+                {
+                        if(!t->itsDataSize)
+                        {
+                                t->itsData = new char[size];
+                                t->itsDataSize = size;
+                        }
+                        else if(t->itsDataSize < size)
+                        {
+                                delete[] (char *)(t->itsData);
+                                t->itsData = new char[size];
+                                t->itsDataSize = size;
+                        }
+                }
+                else if (size == 0)
+                {
+                        if(t->itsDataSize)
+                        {
+                                delete[] (char *)(t->itsData);
+                                t->itsDataSize = 0;
+                        }
                 }
         }
@@ -525 +560 @@
 //printf("DIM RPC: Stopped Timer, Data Received for %s\n", t->getName());
                 if(DimClient::getNoDataCopy() == 0)
-                        memcpy(t->itsData, buf, size);
+                {
+                        if(size > 0)
+                                memcpy(t->itsData, buf, size);
+                        else
+                                t->itsData = buf;
+                }
                 else
                         t->itsData = buf;
@@ -557 +597 @@
         if(DimClient::getNoDataCopy() == 0)
         {
-                if(!itsDataSize)
-                {
-                        itsData = new char[size];
-                        itsDataSize = size;
-                }
-                else if(itsDataSize < size)
-                {
-                        delete[] (char *)(itsData);
-                        itsData = new char[size];
-                        itsDataSize = size;
+                if(size > 0)
+                {
+                        if(!itsDataSize)
+                        {
+                                itsData = new char[size];
+                                itsDataSize = size;
+                        }
+                        else if(itsDataSize < size)
+                        {
+                                delete[] (char *)(itsData);
+                                itsData = new char[size];
+                                itsDataSize = size;
+                        }
+                }
+                else if (size == 0)
+                {
+                        if(itsDataSize)
+                        {
+                                delete[] (char *)(itsData);
+                                itsDataSize = 0;
+                        }
                 }
         }
@@ -572 +623 @@
         {
                 if(DimClient::getNoDataCopy() == 0)
-                        memcpy(itsData, buf, size);
+                {
+                        if(size > 0)
+                                memcpy(itsData, buf, size);
+                        else
+                                itsData = buf;
+                }
                 else
                         itsData = buf;
@@ -653 +709 @@
                                 0, 0,
 //                              rpc_user_routine, itsTagId, 
-                                rpc_user_routine, (long)itsHandler, 
+                                rpc_user_routine, (dim_long)itsHandler, 
                                 itsNolinkBuf, itsNolinkSize);
 //                      dim_usleep(200000);
@@ -704 +760 @@
 //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);
+                rpc_user_routine((dim_long *)&itsHandler, itsNolinkBuf, &itsNolinkSize);
         }
 /*

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

@@ -417 +417 @@
   int doit;
 
-  DBGe(dim_Dbg_SEND_CALLBACK) printf("DimJNI: client SEND_CALLBACK status %08lx:%d\n", (unsigned long)_status, *_status);
+  DBGe(dim_Dbg_SEND_CALLBACK) printf("DimJNI: client SEND_CALLBACK status %08lx:%d\n", (dim_long)_status, *_status);
 
   doit = dim_jni_attachThread(&env);
@@ -443 +443 @@
   jobject theSendSynchronizer;
   
-  extern int request_command(char *, void *, int , void (*)(), long, int);
+  extern int request_command(char *, void *, int , void (*)(), dim_long, int);
 
   const char* cmnd = (*env)->GetStringUTFChars(env, name, 0);
@@ -471 +471 @@
 
   // Send the request
-  ret = request_command((char *)cmnd, data_address, data_size, callback_funct, (long)callback_param, stamped);
+  ret = request_command((char *)cmnd, data_address, data_size, callback_funct, (dim_long)callback_param, stamped);
   DBGx(dim_Dbg_SEND_NATIVE) printf("DimJNI: Client.Send(%s,(%s) 0x%x) returns %d \n", cmnd, send_data_format, * (int*) data_address, ret);
 
@@ -868 +868 @@
 void info_service_callback(jobject* _theDataDecoder, void* dataAddress, int* _dataSize)
 {
-        DBGe(dim_Dbg_INFO_CALLBACK) printf("DimJNI: INFO_CALLBACK(data: %08lx(%08x))\n", (unsigned long) dataAddress, *_dataSize);
+        DBGe(dim_Dbg_INFO_CALLBACK) printf("DimJNI: INFO_CALLBACK(data: %08lx(%08x))\n", (dim_long) dataAddress, *_dataSize);
 
   decodeData(_theDataDecoder, dataAddress, _dataSize, 0);
@@ -877 +877 @@
 void info_service_callback_with_cleanup(jobject* _theDataDecoder, void* dataAddress, int* _dataSize)
 {
-        DBGe(dim_Dbg_INFO_CALLBACK) printf("DimJNI: INFO_CALLBACK/ONCE_ONLY(data: %08lx(%08x))\n", (unsigned long)dataAddress, *_dataSize);
+        DBGe(dim_Dbg_INFO_CALLBACK) printf("DimJNI: INFO_CALLBACK/ONCE_ONLY(data: %08lx(%08x))\n", (dim_long)dataAddress, *_dataSize);
 
   decodeData(_theDataDecoder, dataAddress, _dataSize, 1);
@@ -986 +986 @@
   const char* info = (*env)->GetStringUTFChars(env, name, 0);
   extern unsigned request_service(char *, int, int , void *, int , void (*)(),
-                                    long, void *, int, int);
+                                    dim_long, void *, int, int);
 
 //  DBGe(dim_Dbg_INFO_SERVICE); /* trap only, we report on exit */
@@ -1009 +1009 @@
 
 
-  ret = request_service((char *)info, service_type, timeout, 0, 0, callback_function, (long)callback_param, &no_link, 0, stamped);
-  DBGx(dim_Dbg_INFO_SERVICE) printf("DimJNI: client infoService(%s, DataDecoder@0x%08lx, mode=%d, timeout=%d ) returns %d\n", info, (unsigned long)theNativeDataDecoder, mode, timeout, ret);
+  ret = request_service((char *)info, service_type, timeout, 0, 0, callback_function, (dim_long)callback_param, &no_link, 0, stamped);
+  DBGx(dim_Dbg_INFO_SERVICE) printf("DimJNI: client infoService(%s, DataDecoder@0x%08lx, mode=%d, timeout=%d ) returns %d\n", info, (dim_long)theNativeDataDecoder, mode, timeout, ret);
   (*env)->ReleaseStringUTFChars(env, name, info);
 
@@ -1062 +1062 @@
 
 //printf("Stopping timer %08x %08X\n", callback_param, aDimTimer);
-  ret = dtq_stop_timer((long)callback_param);
+  ret = dtq_stop_timer((dim_long)callback_param);
  //printf("ret = %d\n", ret);
 
@@ -1263 +1263 @@
 //              printf("data address = %x, data size = %d\n",*address, *size);
         }
-        DBGx(dim_Dbg_SERVICE_CALLBACK) printf("DimJNI: server_SERVICE_CALLBACK(dataEncoder=%08lx)\n        ==>    data: %08lx size %08x\n", (unsigned long)dataEncoder, (unsigned long) *address, *size); 
+        DBGx(dim_Dbg_SERVICE_CALLBACK) printf("DimJNI: server_SERVICE_CALLBACK(dataEncoder=%08lx)\n        ==>    data: %08lx size %08x\n", (dim_long)dataEncoder, (dim_long) *address, *size); 
 
         if ((*env)->ExceptionOccurred(env)) (*env)->ExceptionDescribe(env); // clear any possible exception, if we do not do this, all further methods will fail!!
@@ -1409 +1409 @@
         sid = dis_add_service(serviceNameUTF, serviceTypeUTF, 0, 0, server_getInfo_callback, dataEncoder);
 
-        DBGx(dim_Dbg_ADD_SERVICE) printf("DimJNI: Server.addService(%s,%s, @%08lx)=%d\n",serviceNameUTF, serviceTypeUTF, (unsigned long)dataEncoder, sid);
+        DBGx(dim_Dbg_ADD_SERVICE) printf("DimJNI: Server.addService(%s,%s, @%08lx)=%d\n",serviceNameUTF, serviceTypeUTF, (dim_long)dataEncoder, sid);
 
         (*env)->ReleaseStringUTFChars(env, serviceName, serviceNameUTF);
@@ -1420 +1420 @@
 {
 
-        DBGe(dim_Dbg_CMND_CALLBACK) printf("DimJNI: server CMND_CALLBACK(data: %08lx(%08x))\n", (unsigned long) dataAddress, *_dataSize);
+        DBGe(dim_Dbg_CMND_CALLBACK) printf("DimJNI: server CMND_CALLBACK(data: %08lx(%08x))\n", (dim_long) dataAddress, *_dataSize);
 
   decodeData(_theDataDecoder, dataAddress, _dataSize, 0);
@@ -1443 +1443 @@
         sid = dis_add_cmnd(serviceNameUTF, serviceTypeUTF, server_cmnd_callback, dataDecoder);
 
-        DBGx(dim_Dbg_ADD_CMND) printf("DimJNI: Server.addCmnd(%s,%s, @%08lx) = %d\n",serviceNameUTF, serviceTypeUTF, (unsigned long) dataDecoder, sid);
+        DBGx(dim_Dbg_ADD_CMND) printf("DimJNI: Server.addCmnd(%s,%s, @%08lx) = %d\n",serviceNameUTF, serviceTypeUTF, (dim_long) dataDecoder, sid);
 
         (*env)->ReleaseStringUTFChars(env, serviceName, serviceNameUTF);
@@ -2396 +2396 @@
         descriptor->maxEntries = maxEntries;
 
-        DBGx(dim_Dbg_DESCRIPTORS) printf("DimJNI: Native.newObjectDescriptor %08lx\n", (long)descriptor);
-        return (long) descriptor;
+        DBGx(dim_Dbg_DESCRIPTORS) printf("DimJNI: Native.newObjectDescriptor %08lx\n", (dim_long)descriptor);
+        return (dim_long) descriptor;
 }
 
@@ -2432 +2432 @@
         // TODO throw an error if there is no such FieldID
 
-        DBGe(dim_Dbg_DESCRIPTORS) printf("DimJNI: Native.addFieldToObjectDescriptor %08lx Field %s Type %s\n", (long) desc, name, type);
+        DBGe(dim_Dbg_DESCRIPTORS) printf("DimJNI: Native.addFieldToObjectDescriptor %08lx Field %s Type %s\n", (dim_long) desc, name, type);
         // TODO: if(entry==NULL) throw out-of-memory exception, set length to 0
 
@@ -2530 +2530 @@
  
         if(nativeClass){}
-        DBGe(dim_Dbg_DESCRIPTORS) printf("DimJNI: Native.deleteObjectDescriptor %08lx\n", (long)desc);
+        DBGe(dim_Dbg_DESCRIPTORS) printf("DimJNI: Native.deleteObjectDescriptor %08lx\n", (dim_long)desc);
         (*env)->DeleteGlobalRef(env, descriptor->objectClass);
 //printf("free descriptor\n");
@@ -2554 +2554 @@
         jclass objectClass = descriptor->objectClass;
 
-        DBGe(dim_Dbg_DESCRIPTORS) printf("DimJNI: Native.copyIntoObject %08lx\n", (long)desc);
+        DBGe(dim_Dbg_DESCRIPTORS) printf("DimJNI: Native.copyIntoObject %08lx\n", (dim_long)desc);
 
         if(nativeClass){}

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

@@ -225 +225 @@
 }
 
-long dim_start_thread(void *(*thread_ast)(void *), long tag)
+dim_long dim_start_thread(void *(*thread_ast)(void *), dim_long tag)
 {
         pthread_t t_id;
@@ -237 +237 @@
         pthread_create(&t_id, &attr, thread_ast, (void *)tag);
 #endif
-        return((long)t_id);
+        return((dim_long)t_id);
 }       
 
-int dim_stop_thread(long t_id)
+int dim_stop_thread(dim_long t_id)
 {
         int ret;
@@ -533 +533 @@
 }
 
-long dim_start_thread(void (*thread_ast)(), long tag)
+dim_long dim_start_thread(void (*thread_ast)(), dim_long tag)
 
 {
         printf("dim_start_thread: not available\n");
-        return (long)0;
-}
-
-int dim_stop_thread(long t_id)
+        return (dim_long)0;
+}
+
+int dim_stop_thread(dim_long t_id)
 {
         printf("dim_stop_thread: not available\n");
@@ -563 +563 @@
 typedef struct{
         void (*thread_ast)();
-        long tag;
+        dim_long tag;
         
 }THREAD_PARAMS;
 
 #ifndef STDCALL
-long dim_start_thread(void (*thread_ast)(), long tag)
-#else
-long dim_start_thread(unsigned long (*thread_ast)(void *), void *tag)
+dim_long dim_start_thread(void (*thread_ast)(), dim_long tag)
+#else
+dim_long dim_start_thread(dim_long (*thread_ast)(void *), void *tag)
 #endif
 {
@@ -593 +593 @@
         &threadid);                                      /* returns the thread identifier       */
 #endif
-        return (long)hthread;
-}
-
-
-int dim_stop_thread(long thread_id)
+        return (dim_long)hthread;
+}
+
+
+int dim_stop_thread(dim_long thread_id)
 {
         int ret;

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

@@ -37 +37 @@
         struct dis_dns_ent *next;
         struct dis_dns_ent *prev;
-        long dnsid;
+        dim_long dnsid;
         char task_name[MAX_NAME];
         TIMR_ENT *dns_timr_ent;
@@ -78 +78 @@
         int size;
         void (*user_routine)();
-        long tag;
+        dim_long tag;
         int registered;
         int quality;
@@ -163 +163 @@
 _DIM_PROTO( void register_dns_services,  (int flag) );
 _DIM_PROTO( void register_services,  (DIS_DNS_CONN *dnsp, int flag, int dns_flag) );
-_DIM_PROTO( void std_cmnd_handler,   (long *tag, int *cmnd_buff, int *size) );
-_DIM_PROTO( void client_info,           (long *tag, int **bufp, int *size) );
-_DIM_PROTO( void service_info,     (long *tag, int **bufp, int *size) );
+_DIM_PROTO( void std_cmnd_handler,   (dim_long *tag, int *cmnd_buff, int *size) );
+_DIM_PROTO( void client_info,           (dim_long *tag, int **bufp, int *size) );
+_DIM_PROTO( void service_info,     (dim_long *tag, int **bufp, int *size) );
 _DIM_PROTO( void add_exit_handler,   (int *tag, int *bufp, int *size) );
 _DIM_PROTO( static void exit_handler,      (int *tag, int *bufp, int *size) );
@@ -176 +176 @@
 _DIM_PROTO( SERVICE *dis_hash_service_get_next, (int *start, SERVICE *prev, int flag) );
 _DIM_PROTO( static unsigned do_dis_add_service_dns, (char *name, char *type, void *address, int size, 
-                                                                   void (*user_routine)(), long tag, long dnsid ) );
-_DIM_PROTO( static DIS_DNS_CONN *create_dns, (long dnsid) );
+                                                                   void (*user_routine)(), dim_long tag, dim_long dnsid ) );
+_DIM_PROTO( static DIS_DNS_CONN *create_dns, (dim_long dnsid) );
 
 void dis_set_debug_on()
@@ -232 +232 @@
 
 static unsigned do_dis_add_service_dns( char *name, char *type, void *address, int size, 
-                                                                   void (*user_routine)(), long tag, long dnsid )
+                                                                   void (*user_routine)(), dim_long tag, dim_long dnsid )
 {
         register SERVICE *new_serv;
@@ -239 +239 @@
         int dis_hash_service_insert();
         DIS_DNS_CONN *dnsp;
-        extern DIS_DNS_CONN *dis_find_dns(long);
+        extern DIS_DNS_CONN *dis_find_dns(dim_long);
 
         dis_init();
@@ -324 +324 @@
 
 static unsigned do_dis_add_service( char *name, char *type, void *address, int size, 
-                                                                   void (*user_routine)(), long tag )
+                                                                   void (*user_routine)(), dim_long tag )
 {
         return do_dis_add_service_dns( name, type, address, size, 
@@ -369 +369 @@
 
 unsigned dis_add_service( char *name, char *type, void *address, int size, 
-                                                 void (*user_routine)(), long tag)
+                                                 void (*user_routine)(), dim_long tag)
 {
         unsigned ret;
@@ -389 +389 @@
 }
 
-unsigned dis_add_service_dns( long dnsid, char *name, char *type, void *address, int size, 
-                                                         void (*user_routine)(), long tag)
+unsigned dis_add_service_dns( dim_long dnsid, char *name, char *type, void *address, int size, 
+                                                         void (*user_routine)(), dim_long tag)
 {
         unsigned ret;
@@ -410 +410 @@
 }
 
-static unsigned do_dis_add_cmnd_dns( char *name, char *type, void (*user_routine)(), long tag, long dnsid )
+static unsigned do_dis_add_cmnd_dns( char *name, char *type, void (*user_routine)(), dim_long tag, dim_long dnsid )
 {
         register SERVICE *new_serv;
@@ -417 +417 @@
         int dis_hash_service_insert();
         DIS_DNS_CONN *dnsp;
-        extern DIS_DNS_CONN *dis_find_dns(long);
+        extern DIS_DNS_CONN *dis_find_dns(dim_long);
 
         dis_init();
@@ -488 +488 @@
 }
 
-static unsigned do_dis_add_cmnd( char *name, char *type, void (*user_routine)(), long tag)
+static unsigned do_dis_add_cmnd( char *name, char *type, void (*user_routine)(), dim_long tag)
 {
         return do_dis_add_cmnd_dns(name, type, user_routine, tag, 0);
 }
 
-unsigned dis_add_cmnd( char *name, char *type, void (*user_routine)(), long tag ) 
+unsigned dis_add_cmnd( char *name, char *type, void (*user_routine)(), dim_long tag ) 
 {
         unsigned ret;
@@ -507 +507 @@
 }
 
-unsigned dis_add_cmnd_dns( long dnsid, char *name, char *type, void (*user_routine)(), long tag ) 
+unsigned dis_add_cmnd_dns( dim_long dnsid, char *name, char *type, void (*user_routine)(), dim_long tag ) 
 {
         unsigned ret;
@@ -643 +643 @@
         int dns_timr_time;
         extern int rand_tmout(int, int);
-        extern int open_dns(long, void (*)(), void (*)(), int, int, int);
+        extern int open_dns(dim_long, void (*)(), void (*)(), int, int, int);
         extern DIS_DNS_CONN *find_dns_by_conn_id(int);
         extern void do_register_services(DIS_DNS_CONN *);
@@ -1044 +1044 @@
 }
 
-static DIS_DNS_CONN *create_dns(long dnsid)
+static DIS_DNS_CONN *create_dns(dim_long dnsid)
 {
         DIS_DNS_CONN *dnsp;
@@ -1090 +1090 @@
 }
 
-int dis_start_serving_dns(long dnsid, char *task/*, int *idlist*/)
+int dis_start_serving_dns(dim_long dnsid, char *task/*, int *idlist*/)
 {
         char str0[MAX_NAME], str1[MAX_NAME],str2[MAX_NAME],
@@ -1096 +1096 @@
         char task_name_aux[MAX_TASK_NAME];
         extern int open_dns();
-        extern DIS_DNS_CONN *dis_find_dns(long);
+        extern DIS_DNS_CONN *dis_find_dns(dim_long);
         DIS_DNS_CONN *dnsp;
         int more_ids[10] = {0};
@@ -1161 +1161 @@
                                  sizeof(Version_number), 0, 0, dnsid );
 
-                more_ids[1] = do_dis_add_service_dns( str1, "C", 0, 0, client_info, (long)dnsp, dnsid );
+                more_ids[1] = do_dis_add_service_dns( str1, "C", 0, 0, client_info, (dim_long)dnsp, dnsid );
                 dnsp->dis_client_id = more_ids[1];
-                more_ids[2] = do_dis_add_service_dns( str2, "C", 0, 0, service_info, (long)dnsp, dnsid );
+                more_ids[2] = do_dis_add_service_dns( str2, "C", 0, 0, service_info, (dim_long)dnsp, dnsid );
                 dnsp->dis_service_id = more_ids[2];
                 more_ids[3] = do_dis_add_cmnd_dns( str3, "L:1", add_exit_handler, 0, dnsid );
@@ -1757 +1757 @@
 dim_print_date_time();
 printf("Updating %s (id = %d, ptr = %08lX) for %s@%s (req_id = %d, req_ptr = %08lX)\n",
-           servp->name, (int)service_id, (unsigned long)servp, 
-           Net_conns[reqp->conn_id].task, Net_conns[reqp->conn_id].node, reqp->req_id, (unsigned long)reqp);
+           servp->name, (int)service_id, (unsigned dim_long)servp, 
+           Net_conns[reqp->conn_id].task, Net_conns[reqp->conn_id].node, reqp->req_id, (unsigned dim_long)reqp);
 }
 */
@@ -2225 +2225 @@
 int dis_no_dns();
 int hash_index, old_index;
-extern int close_dns(long, int);
+extern int close_dns(dim_long, int);
 CLIENT *clip, *cprevp;
 
@@ -2332 +2332 @@
 }
 
-void dis_stop_serving_dns(long dnsid)
+void dis_stop_serving_dns(dim_long dnsid)
 {
         DIS_DNS_CONN *dnsp, *dis_find_dns();
@@ -2726 +2726 @@
 typedef struct cmnds{
         struct cmnds *next;
-        long tag;
+        dim_long tag;
         int size;
         int buffer[1];
@@ -2733 +2733 @@
 static DIS_CMND *Cmnds_head = (DIS_CMND *)0;
 
-void std_cmnd_handler(long *tag, int *cmnd_buff, int *size)
+void std_cmnd_handler(dim_long *tag, int *cmnd_buff, int *size)
 {
         register DIS_CMND *new_cmnd;
@@ -2751 +2751 @@
 }
 
-int dis_get_next_cmnd(long *tag, int *buffer, int *size)
+int dis_get_next_cmnd(dim_long *tag, int *buffer, int *size)
 {
         register DIS_CMND *cmndp;
@@ -2829 +2829 @@
 #endif
 
-void client_info(long *tag, int **bufp, int *size, int *first_time)
+void client_info(dim_long *tag, int **bufp, int *size, int *first_time)
 {
         register CLIENT *clip;
@@ -2953 +2953 @@
 }
 
-void service_info(long *tag, int **bufp, int *size, int *first_time)
+void service_info(dim_long *tag, int **bufp, int *size, int *first_time)
 {
         register SERVICE *servp;
@@ -3334 +3334 @@
 }
 
-DIS_DNS_CONN *dis_find_dns(long dnsid)
+DIS_DNS_CONN *dis_find_dns(dim_long dnsid)
 {
         DIS_DNS_CONN *dnsp;
@@ -3369 +3369 @@
 {
         DIS_DNS_CONN *dnsp;
-        extern long dns_get_dnsid();
-        long dnsid;
+        extern dim_long dns_get_dnsid();
+        dim_long dnsid;
 
         dnsid = dns_get_dnsid(conn_id, SRC_DIS);

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

@@ -61 +61 @@
                 itsId = dis_add_service( name, format, NULL, 0, 
 //                              user_routine, itsTagId);
-                                user_routine, (long)this);
+                                user_routine, (dim_long)this);
                 DimServer::start();
         }
@@ -68 +68 @@
                 itsId = dis_add_service_dns( itsDns->getDnsId(), name, format, NULL, 0, 
 //                              user_routine, itsTagId);
-                                user_routine, (long)this);
+                                user_routine, (dim_long)this);
 //              itsDns->addServiceId(itsId);
                 DimServer::start(itsDns);
@@ -139 +139 @@
                 itsId = dis_add_cmnd( name, format, command_routine,
 //                              itsTagId);
-                                (long)this);
+                                (dim_long)this);
                 DimServer::start();
         }
@@ -146 +146 @@
                 itsId = dis_add_cmnd_dns( itsDns->getDnsId(), name, format, command_routine,
 //                      itsTagId);
-                        (long)this);
+                        (dim_long)this);
 //              itsDns->addServiceId(itsId);
                 DimServer::start(itsDns);
@@ -248 +248 @@
                 itsIdIn = dis_add_cmnd( itsNameIn, formatin, 
 //                      rpcin_routine, itsTagId);
-                        rpcin_routine, (long)this);
+                        rpcin_routine, (dim_long)this);
                 itsIdOut = dis_add_service( itsNameOut, formatout, 0,0, 
 //                      rpcout_routine, itsTagId);
-                        rpcout_routine, (long)this);
+                        rpcout_routine, (dim_long)this);
                 DimServer::start();
         }
@@ -258 +258 @@
                 itsIdIn = dis_add_cmnd_dns( itsDns->getDnsId(), itsNameIn, formatin, 
 //                      rpcin_routine, itsTagId);
-                        rpcin_routine, (long)this);
+                        rpcin_routine, (dim_long)this);
                 itsIdOut = dis_add_service_dns( itsDns->getDnsId(), itsNameOut, formatout, 0,0, 
 //                      rpcout_routine, itsTagId);
-                        rpcout_routine, (long)this);
+                        rpcout_routine, (dim_long)this);
 //              itsDns->addServiceId(itsIdIn);
 //              itsDns->addServiceId(itsIdOut);
@@ -369 +369 @@
 }
 
-long DimServerDns::getDnsId()
+dim_long DimServerDns::getDnsId()
 {
         return itsDnsId;
@@ -445 +445 @@
 void DimServer::start(DimServerDns *dns, const char *name)
 {
-        long dnsid;
+        dim_long dnsid;
 
         DISABLE_AST
@@ -487 +487 @@
 void DimServer::start(DimServerDns *dns)
 {
-        long dnsid;
+        dim_long dnsid;
         char *name;
         int isAuto;
@@ -669 +669 @@
 }
 
-long DimServer::addDns(const char *node, int port) 
+dim_long DimServer::addDns(const char *node, int port) 
 {
         return dis_add_dns((char *)node, port); 

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

@@ -389 +389 @@
 }
         
-TIMR_ENT *dtq_add_entry(int queue_id, int time, void (*user_routine)(), long tag)
+TIMR_ENT *dtq_add_entry(int queue_id, int time, void (*user_routine)(), dim_long tag)
 {
         TIMR_ENT *new_entry, *queue_head, *auxp, *prevp;
@@ -780 +780 @@
 }
 
-void dtq_start_timer(int time, void (*user_routine)(), long tag)
+void dtq_start_timer(int time, void (*user_routine)(), dim_long tag)
 {
         extern void dim_init_threads();
@@ -796 +796 @@
 
 
-int dtq_stop_timer(long tag)
+int dtq_stop_timer(dim_long tag)
 {
         TIMR_ENT *entry, *queue_head;
@@ -816 +816 @@
 static int Dtq_sleeping = 0;
 
-void dtq_sleep_rout(long tag)
+void dtq_sleep_rout(dim_long tag)
 {
         if(tag){}

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

@@ -41 +41 @@
         int out, in;
         
-        sprintf(name,"TESTRPC%d/INT",(long)tag);
+        sprintf(name,"TESTRPC%d/INT",(dim_long)tag);
         myRpc = new DimRpcInfo(name, 10, -1);
 //      myRpc = new Rpc(name);
@@ -54 +54 @@
 dim_lock();
 dim_print_date_time();
-cout << "Instance "<<(long)tag<<" sent "<<out<< " got "<<in <<endl;
+cout << "Instance "<<(dim_long)tag<<" sent "<<out<< " got "<<in <<endl;
 dim_unlock();
                 out++;

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

@@ -57 +57 @@
 {
         if(tag){}
-        printf("Received VERSION %lx, %d\n", (long)buf, *size);
+        printf("Received VERSION %lx, %d\n", (dim_long)buf, *size);
 }
 

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

@@ -70 +70 @@
         int on = 0;
 */
-        long dnsid = 0;
+        dim_long dnsid = 0;
         char extra_dns[128];
         int new_dns = 0;

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

@@ -173 +173 @@
         char node[MAX_DNS_NODE];
         int port;
-        long sid, cid;
+        dim_long sid, cid;
 
         DISABLE_AST
@@ -235 +235 @@
 }
 
-long dis_add_dns(char *node_name, int port_number)
+dim_long dis_add_dns(char *node_name, int port_number)
 {
         DNS_CONN *connp;
@@ -253 +253 @@
                 dll_insert_queue( (DLL *) DNS_conn_head, (DLL *) connp );
         }
-        return (long)connp;
-}
-
-long dic_add_dns(char *node_name, int port_number)
+        return (dim_long)connp;
+}
+
+dim_long dic_add_dns(char *node_name, int port_number)
 {
         DNS_CONN *connp;
@@ -274 +274 @@
                 dll_insert_queue( (DLL *) DNS_conn_head, (DLL *) connp );
         }
-        return (long)connp;
+        return (dim_long)connp;
 }
 
@@ -296 +296 @@
 }
 
-int close_dns(long dnsid, SRC_TYPES src_type)
+int close_dns(dim_long dnsid, SRC_TYPES src_type)
 {
         DNS_CONN *connp;
@@ -311 +311 @@
 }
 
-int open_dns(long dnsid, void (*recv_rout)(), void (*error_rout)(), int tmout_min, int tmout_max, SRC_TYPES src_type )
+int open_dns(dim_long dnsid, void (*recv_rout)(), void (*error_rout)(), int tmout_min, int tmout_max, SRC_TYPES src_type )
 {
         char nodes[MAX_DNS_NODE];
@@ -424 +424 @@
 }       
 
-long dns_get_dnsid(int conn_id, SRC_TYPES src_type)
+dim_long dns_get_dnsid(int conn_id, SRC_TYPES src_type)
 {
         DNS_CONN *connp;
@@ -449 +449 @@
                 if(connp == DNS_ids[src_type])
                 {
-                        return (long)0;
+                        return (dim_long)0;
                 }
                 else
                 {
-                        return (long)connp;
-                }
-        }
-        return (long)-1;
-}
+                        return (dim_long)connp;
+                }
+        }
+        return (dim_long)-1;
+}