Fix ipcbench build

Neil T. Dantam · Neil T. Dantam · commit c50a626aab09 · 2015-07-02T16:18:42.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -134,3 +134,4 @@ modules.order
 /mask
 /ach-poll-example
 /debian/libach4
+/ipcbench
diff --git a/Makefile.am b/Makefile.am
@@ -1,5 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
+BUILT_SOURCES =
+
 EXTRA_DIST = \
 	spin
 
@@ -87,9 +89,99 @@ achd_SOURCES = src/achd/achd.c   \
 achd_LDADD = libach.la libachutil.la
 
 
-bin_PROGRAMS += achbench
-achbench_SOURCES = src/ach-bench.c
-achbench_LDADD = libach.la libachutil.la
+# bin_PROGRAMS += achbench
+# achbench_SOURCES = src/ach-bench.c
+# achbench_LDADD = libach.la libachutil.la
+
+bin_PROGRAMS += ipcbench
+ipcbench_SOURCES = benchmark/src/ipcbench.c
+ipcbench_SOURCES += benchmark/src/pipe.c \
+                    benchmark/src/mq.c \
+                    benchmark/src/tcp.c \
+                    benchmark/src/unix.c \
+                    benchmark/src/udp.c \
+                    benchmark/src/localdgram.c \
+                    benchmark/src/udp_multicast.c
+ipcbench_SOURCES += benchmark/src/ach.c
+AM_CPPFLAGS += -I$(top_srcdir)/benchmark/include
+
+## LCM ##
+if HAVE_LCM
+
+bin_PROGRAMS += lcm_buffer
+
+lcm_buffer_SOURCES = src/lcm_buffer.c ipcbench_lcm_timestamp_t.c
+lcm_buffer_LDADD = -llcm
+
+ipcbench_SOURCES += ipcbench_lcm_timestamp_t.c src/lcm.c
+LDADD_LCM = -llcm
+BUILT_LCM = ipcbench_lcm_timestamp_t.c ipcbench_lcm_timestamp_t.h
+
+ipcbench_lcm_timestamp_t.h: ipcbench_lcm_timestamp_t.c
+
+ipcbench_lcm_timestamp_t.c: src/lcm_msg.lcm
+	lcm-gen -c $<
+
+endif
+
+## TAO ##
+if HAVE_TAO
+
+bin_PROGRAMS += ace_server
+BUILT_TAO = .idlgen.stamp
+
+
+.idlgen.stamp: src/corba/ipcbench.idl
+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(ACE_ROOT)/lib \
+		$(ACE_ROOT)/TAO/TAO_IDL/tao_idl $<
+	touch $@
+
+ipcbenchS.cpp: .idlgen.stamp
+ipcbenchC.cpp: .idlgen.stamp
+ipcbenchS.h: .idlgen.stamp
+ipcbenchC.h: .idlgen.stamp
+
+ace_server_SOURCES = src/corba/server.cpp ipcbenchS.cpp ipcbenchC.cpp
+ace_server_LDADD =  \
+	-lACE -lTAO \
+	-lTAO_AnyTypeCode \
+	-lTAO_TypeCodeFactory \
+	-lTAO_IDL_BE \
+	-lTAO_IDL_FE \
+	-lTAO_PortableServer \
+	-lTAO_IFR_Client
+
+
+ipcbench_SOURCES += src/corba/corba.cpp ipcbenchC.cpp ipcbenchS.cpp src/corba/cos.cpp
+LDADD_TAO = \
+	-lACE -lTAO \
+	-lTAO_AnyTypeCode \
+	-lTAO_Svc_Utils \
+	-lTAO_Messaging \
+	-lTAO_Valuetype \
+	-lTAO_PI \
+	-lTAO_CodecFactory \
+	-lTAO_DynamicInterface \
+	-lTAO_CosEvent_Skel \
+	-lTAO_CosEvent \
+	-lTAO_CosNaming \
+	-lTAO_CosNotification \
+	-lTAO_CosTime \
+	-lTAO_CosTrading \
+	-lTAO_CosEvent_Serv \
+	-lTAO_TypeCodeFactory \
+	-lTAO_IDL_BE \
+	-lTAO_IDL_FE \
+	-lTAO_PortableServer \
+	-lTAO_IFR_Client
+endif
+
+# Link Libraries
+ipcbench_LDADD = $(LDADD_LCM) $(LDADD_TAO)  libach.la
+
+BUILT_SOURCES += $(BUILT_LCM) $(BUILT_TAO)
+
+
 
 noinst_PROGRAMS = ach-example
 ach_example_SOURCES = src/ach-example.c
@@ -201,7 +293,7 @@ EXTRA_DIST += $(JSOURCES)
 
 if BUILD_JAVA
 
-BUILT_SOURCES = org_golems_ach_Lib.h
+BUILT_SOURCES += org_golems_ach_Lib.h
 
 
 JCLASSES =                                \
diff --git a/benchmark/include/util.h b/benchmark/include/util.h
@@ -15,13 +15,14 @@ static struct timespec get_ticks() {
 
 static void calibrate(void) {
     /* warm up */
-    for( size_t i = 0; i < 10; i++) get_ticks();
+    size_t i;
+    for( i = 0; i < 10; i++) get_ticks();
 
     /* Average tick time */
     double a = 0;
     struct timespec r0,r1;
     overhead = 0;
-    for( size_t i = 0; i<1000; i++ ) {
+    for( i = 0; i<1000; i++ ) {
         r0 = get_ticks();
         r1 = get_ticks();
         a += ticks_delta(r0,r1);
diff --git a/benchmark/src/ach.c b/benchmark/src/ach.c
@@ -55,12 +55,13 @@ static void s_init(enum ach_map map)
 {
     channel = (struct ach_channel*)calloc(ipcbench_cnt, sizeof(struct ach_channel));
 
-    for( size_t i = 0; i < ipcbench_cnt; i ++ ) {
+    size_t i;
+    enum ach_status r;
+    for( i = 0; i < ipcbench_cnt; i ++ ) {
         char buf[64];
-        snprintf( buf, sizeof(buf), CHAN_NAME "-%d", i );
-
-        ach_status_t r = ach_unlink(buf);               /* delete first */
+        snprintf( buf, sizeof(buf), CHAN_NAME "-%lu", i );
 
+        r = ach_unlink(buf);               /* delete first */
         if( !( ACH_OK == r || ACH_ENOENT == r) ) {
             fprintf(stderr, "ach_unlink: %s\n", ach_result_to_string(r) );
             abort();
@@ -87,13 +88,13 @@ static void s_init(enum ach_map map)
             } else if( ach_status_match(r, ACH_MASK_ENOENT | ACH_MASK_EACCES) ) {
                 usleep(1000);     /* Race against udev */
             } else {
-                fprintf(stderr, "ach_open", ach_result_to_string(r) );
+                fprintf(stderr, "ach_open: %s", ach_result_to_string(r) );
                 abort();
             }
         }
 
         if( ipcbench_cnt > 1 ) {
-            enum ach_status r = ach_channel_fd(&channel[i], &ipcbench_pfd[i].fd);
+            r = ach_channel_fd(&channel[i], &ipcbench_pfd[i].fd);
             if( ACH_OK != r ) {
                 fprintf(stderr, "ach_channel_fd: %s\n", ach_result_to_string(r));
                 abort();
@@ -115,9 +116,10 @@ static void s_init_kernel()
 }
 
 static void s_destroy(void) {
-    for( size_t i = 0; i < ipcbench_cnt; i ++ ) {
+    size_t i;
+    for( i = 0; i < ipcbench_cnt; i ++ ) {
         char buf[64];
-        snprintf( buf, sizeof(buf), CHAN_NAME "-%d", i );
+        snprintf( buf, sizeof(buf), CHAN_NAME "-%lu", i );
 
         enum ach_status r = ach_unlink(buf);
         if( ACH_OK != r ) {
diff --git a/benchmark/src/ipcbench.c b/benchmark/src/ipcbench.c
@@ -45,6 +45,7 @@
 #endif //HAVE_CONFIG
 
 #include <signal.h>
+#include <math.h>
 #include <sys/wait.h>
 #include "ipcbench.h"
 #include "util.h"
@@ -125,7 +126,8 @@ static void recv(struct ipcbench_vtab *vtab, int emit) {
     }
 
     /* warm up */
-    for( size_t i = 0; i < opt_discard; i ++ ) {
+    size_t i;
+    for( i = 0; i < opt_discard; i ++ ) {
         struct timespec ts;
         vtab->recv(&ts );
     }
@@ -197,7 +199,7 @@ int main( int argc, char **argv ) {
 
 
     /* Parse args */
-    const char *type = "ach";
+    const char *type = sym_vtabs[0].name;
     char *endptr = 0;
     int c;
     while( (c = getopt( argc, argv, "lt:f:s:S:c:d:v?V")) != -1 ) {
@@ -217,10 +219,13 @@ int main( int argc, char **argv ) {
             }
             break;
         case 'l':
-            for( size_t i = 0; NULL != sym_vtabs[i].name; i++ ) {
+        {
+            size_t i;
+            for( i = 0; NULL != sym_vtabs[i].name; i++ ) {
                 puts( sym_vtabs[i].name );
             }
             exit(EXIT_SUCCESS);
+        }
         case 's':
             opt_subscribers = (size_t)atoi(optarg);
             break;
@@ -292,8 +297,8 @@ int main( int argc, char **argv ) {
     /* Compute period */
     {
         double period = 1.0 / opt_freq;
-        ipcbench_period.tv_sec = period;
-        ipcbench_period.tv_nsec = (period - (time_t)period) * 1e9;
+        ipcbench_period.tv_sec = (time_t)period;
+        ipcbench_period.tv_nsec = (long) ((period - floor(period)) * 1e9);
     }
 
     /* Setup message queue */
@@ -314,27 +319,33 @@ int main( int argc, char **argv ) {
 
     /* Execute */
     ipcbench_pfd = (struct pollfd*)calloc(ipcbench_cnt, sizeof(struct pollfd));
-    for( size_t i = 0; i < ipcbench_cnt; i ++ ) {
-        ipcbench_pfd[i].events = POLLIN;
+    {
+        size_t i;
+        for( i = 0; i < ipcbench_cnt; i ++ ) {
+            ipcbench_pfd[i].events = POLLIN;
+        }
     }
     if( vtab->init ) vtab->init();
 
     /* Fork subscribers */
     pid_t pid_listen[opt_subscribers + opt_nonrt_subscribers];
-    for( size_t i = 0; i < opt_subscribers + opt_nonrt_subscribers; i ++ ) {
-        pid_listen[i] = fork();
-        if( 0 == pid_listen[i] ) {
-            int emit = 1;
-            if( i >= opt_subscribers ) {
-                make_realtime(0);
-                emit=0;
+    {
+        size_t i;
+        for( i = 0; i < opt_subscribers + opt_nonrt_subscribers; i ++ ) {
+            pid_listen[i] = fork();
+            if( 0 == pid_listen[i] ) {
+                int emit = 1;
+                if( i >= opt_subscribers ) {
+                    make_realtime(0);
+                    emit=0;
+                }
+                if( vtab->recv_loop ) vtab->recv_loop(emit);
+                else recv(vtab, emit);
+                return 0;
+            } else if ( pid_listen[i] < 0 ) {
+                perror("Couldn't fork\n");
+                abort();
             }
-            if( vtab->recv_loop ) vtab->recv_loop(emit);
-            else recv(vtab, emit);
-            return 0;
-        } else if ( pid_listen[i] < 0 ) {
-            perror("Couldn't fork\n");
-            abort();
         }
     }
 
@@ -350,9 +361,12 @@ int main( int argc, char **argv ) {
     }
 
     /* Wait */
-    sleep(opt_sec);
-    for( size_t i = 0; i < opt_subscribers; i ++ ) {
-        kill_wait(pid_listen[i]);
+    sleep((unsigned)opt_sec);
+    {
+        size_t i;
+        for( i = 0; i < opt_subscribers; i ++ ) {
+            kill_wait(pid_listen[i]);
+        }
     }
     kill_wait(pid_send);
 
@@ -361,6 +375,8 @@ int main( int argc, char **argv ) {
 
     if( vtab->destroy ) vtab->destroy();
 
+    /* remove mq */
+    //mq_unlink(MQ);
     return 0;
 
 }
diff --git a/benchmark/src/localdgram.c b/benchmark/src/localdgram.c
@@ -58,11 +58,12 @@
 static int *sock;
 static struct sockaddr_un *addr;
 
-#define NAME "/tmp/ipcbench-%d.dsock"
+#define NAME "/tmp/ipcbench-%lu.dsock"
 
 
 static void s_init(void) {
-    for( size_t i = 0; i < ipcbench_cnt; i ++ ) {
+    size_t i;
+    for( i = 0; i < ipcbench_cnt; i ++ ) {
         char buf[64];
         snprintf(buf, sizeof(buf), NAME, i);
         unlink( buf );
@@ -72,7 +73,8 @@ static void s_init(void) {
 }
 
 static void s_init_send(void) {
-    for( size_t i = 0; i < ipcbench_cnt; i ++ ) {
+    size_t i;
+    for( i = 0; i < ipcbench_cnt; i ++ ) {
         sock[i] = socket( PF_UNIX, SOCK_DGRAM, 0 );
         if( sock[i] < 0 ) {
             perror( "Could not create socket");
@@ -89,7 +91,8 @@ static void s_init_send(void) {
 static void s_init_recv(void) {
     s_init_send();
 
-    for( size_t i = 0; i < ipcbench_cnt; i ++ ) {
+    size_t i;
+    for( i = 0; i < ipcbench_cnt; i ++ ) {
         if (bind(sock[i], (struct sockaddr *) &addr[i], sizeof(struct sockaddr_un)) < 0) {
             perror("Failed to bind the socket");
             abort();
diff --git a/benchmark/src/mq.c b/benchmark/src/mq.c
@@ -55,8 +55,9 @@ static mqd_t *fd;
 static void s_open(int flag) {
     char buf[64];
     fd = (mqd_t*)calloc(ipcbench_cnt,sizeof(mqd_t));
-    for( size_t i = 0; i < ipcbench_cnt; i ++ ) {
-        snprintf(buf, sizeof(buf), NAME "-%d");
+    size_t i;
+    for( i = 0; i < ipcbench_cnt; i ++ ) {
+        snprintf(buf, sizeof(buf), NAME "-%lu", i);
         struct mq_attr attr = {.mq_maxmsg = 10,
                                .mq_msgsize = sizeof(struct timespec),
                                .mq_flags = 0};
diff --git a/benchmark/src/pipe.c b/benchmark/src/pipe.c
@@ -53,7 +53,8 @@ static int *fd;
 static void s_init() {
     printf("pipe\n");
     fd = (int*) malloc( 2 * sizeof(int) * ipcbench_cnt );
-    for( size_t i = 0; i < ipcbench_cnt; i ++ ) {
+    size_t i;
+    for( i = 0; i < ipcbench_cnt; i ++ ) {
         if( pipe(fd + 2*i) ) {
             perror( "could not create pipe" );
             abort();
diff --git a/benchmark/src/tcp.c b/benchmark/src/tcp.c
diff --git a/benchmark/src/udp.c b/benchmark/src/udp.c
diff --git a/benchmark/src/unix.c b/benchmark/src/unix.c
diff --git a/configure.ac b/configure.ac
