Changeset 18920 for trunk/FACT++/dim/src/examples

Timestamp:

10/18/17 13:54:41 (7 years ago)

Author:

tbretz

Message:

Updated to v20r20 - This also includes some minor fixes, I requested.

Location:

trunk/FACT++/dim/src/examples

Files:

• test_server.c (modified) (4 diffs)
• test_server.cxx (modified) (2 diffs)

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

@@ -67 +67 @@
         char aux[80];
         char name[84]/*, name1[132]*/;
+        char srvname[64];
 /*
         int on = 0;
@@ -93 +94 @@
         printf("result = %d\n", status); 
 */
+        dim_print_date_time();
+        printf("Dim Server Starting up...\n");
+        fflush(stdout);
         if(argc){}
         new_dns = dim_get_env_var("EXTRA_DNS_NODE", extra_dns, sizeof(extra_dns));
@@ -107 +111 @@
         dis_add_client_exit_handler(client_exited);
 
+        strcpy(srvname, argv[1]);
+        if(!strcmp(srvname,"xx1"))
+                strcpy(srvname,"xx");
         for(i = 0; i< 10; i++)
         {
-                sprintf(str[i],"%s/Service_%03d",argv[1],i);
+                sprintf(str[i],"%s/Service_%03d",srvname,i);
                 dis_add_service( str[i], "C", str[i], (int)strlen(str[i])+1, 
                         (void *)0, 0 );
@@ -123 +130 @@
         strcpy(t.str,"hello world");
 
-        sprintf(aux,"%s/TEST_SWAP",argv[1]);
+        sprintf(aux,"%s/TEST_SWAP",srvname);
         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(!strcmp(argv[1],"xx1"))
+        {
+                sprintf(aux,"%s/TEST_SWAP1",srvname);
+                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]);
+        sprintf(aux,"%s/TEST_CMD",srvname);
         dis_add_cmnd(aux,"l:3;d:1;s:1;c:1;s:1;f:1;c:20",cmnd_rout, 0);
 

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

@@ -137 +137 @@
 //      delete dim;
 
+        dis_set_debug_on();
         DimServer::start("TEST");
         extraDns = DimUtil::getEnvVar((char *)"EXTRA_DNS_NODE");
         if(extraDns)
-                newDns = new DimServerDns(extraDns, 0, (char *)"new_TEST");
+                newDns = new DimServerDns(extraDns, 0, (char *)"TEST");
+//              newDns = new DimServerDns(extraDns, 0, (char *)"new_TEST");
 
 //      int i, arr[15000];
@@ -156 +158 @@
         if(extraDns)
         {
-                new_servint = new DimService(newDns, "new_TEST/INTVAL",ival);
+//              new_servint = new DimService(newDns, "new_TEST/INTVAL",ival);
+                new_servint = new DimService(newDns, "TEST/new_INTVAL",ival);
         }