roboortegen.pl: source code clean up.

diff --git a/src/laser-nav/mcl/Makefile.omk b/src/laser-nav/mcl/Makefile.omk
index 31e6e9643c62988a616696384c1adda6930a7d48..f0a764afe7f08ca6115afc00b47a37fe5ef00e8d 100644 (file)
--- a/src/laser-nav/mcl/Makefile.omk
+++ b/src/laser-nav/mcl/Makefile.omk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 
-SUBDIRS = test
+#SUBDIRS = test
 
 lib_LIBRARIES = mcl
 mcl_SOURCES = mcl.c

diff --git a/src/roboorte/utils/roboortegen.pl b/src/roboorte/utils/roboortegen.pl
index 985e5870090a3b8bdc9532628d4aa0be97b1dad6..1132568d55b8b6d44d4783596ee5c7cb36be026c 100755 (executable)
--- a/src/roboorte/utils/roboortegen.pl
+++ b/src/roboorte/utils/roboortegen.pl
@@ -328,7 +328,7 @@ print OUTFILE << "(END)";
 print OUTFILE << "(END)";
 ROBOORTE_PUBLISHER_DESTROY($structname->{"name"})
 {
-       ORTEPublicationDestroy($data_arg_name->$publication_prefix$structname->{"name"});
+\tORTEPublicationDestroy($data_arg_name->$publication_prefix$structname->{"name"});
 }
 
 (END)
@@ -346,18 +346,18 @@ print OUTFILE << "(END)";
 print OUTFILE << "(END)";
 ROBOORTE_SUBSCRIBER_CREATE($structname->{"name"})
 {
-       ORTESubscription *s;
-       NtpTime deadline, minimumSeparation;
-
-       $structname->{"name"}_type_register($data_arg_name->$orte_domain);
-
-       NTPTIME_BUILD(deadline, $subscription_deadline);
-       NTPTIME_BUILD(minimumSeparation, $minimum_separation);
-       s = ORTESubscriptionCreate(
-                       $data_arg_name->$orte_domain, $subscription_mode, $subscription_type, 
-                       "$structname->{"name"}", "$structname->{"name"}", 
-                       &$data_arg_name->$structname->{"name"}, &deadline, &minimumSeparation,
-                       $callback_name, $callback_arg, $multicast_ip_address);
+\tORTESubscription *s;
+\tNtpTime deadline, minimumSeparation;
+\t
+\t$structname->{"name"}_type_register($data_arg_name->$orte_domain);
+\t
+\tNTPTIME_BUILD(deadline, $subscription_deadline);
+\tNTPTIME_BUILD(minimumSeparation, $minimum_separation);
+\ts = ORTESubscriptionCreate(
+\t\t\t$data_arg_name->$orte_domain, $subscription_mode, $subscription_type, 
+\t\t\t"$structname->{"name"}", "$structname->{"name"}", 
+\t\t\t&$data_arg_name->$structname->{"name"}, &deadline, &minimumSeparation,
+\t\t\t$callback_name, $callback_arg, $multicast_ip_address);
 }
 
 (END)
@@ -372,19 +372,19 @@ print OUTFILE << "(END)";
 
 ROBOORTE_INIT()
 {
-       int rv = 0;
-       
-       ORTEInit();
-
-       ORTEVerbositySetOptions("ALL.0");
-       $data_arg_name->$orte_domain = ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,
-                                               NULL, NULL, ORTE_FALSE);
-       if (!$data_arg_name->$orte_domain) {
-               printf("ORTEDomainAppCreate failed!\\n");
-               rv = -1;
-       }
-       
-       return rv;
+\tint rv = 0;
+\t
+\tORTEInit();
+\t
+\tORTEVerbositySetOptions("ALL.0");
+\t$data_arg_name->$orte_domain = ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,
+\t                                     NULL, NULL, ORTE_FALSE);
+\tif (!$data_arg_name->$orte_domain) {
+\t\tprintf("ORTEDomainAppCreate failed!\\n");
+\t\trv = -1;
+\t}
+\t
+\treturn rv;
 }
 (END)
 
@@ -523,7 +523,7 @@ print OUTFILE << "(END)";
        foreach $structname (@idl) {
 print OUTFILE << "(END)";
 void send_$structname->{"name"}_cb(const ORTESendInfo *info, void *vinstance, 
-                       void *sendCallBackParam)
+\t\t\tvoid *sendCallBackParam)
 {
 }
 
@@ -535,55 +535,55 @@ print OUTFILE << "(END)";
 /* Thread process. Do the job. */
 void *process(void *arg)
 {
-       struct $roboorte_name\_orte_data *orte = (struct $roboorte_name\_orte_data*)arg;
-       int i = 0;
+\tstruct $roboorte_name\_orte_data *orte = (struct $roboorte_name\_orte_data*)arg;
+\tint i = 0;
 
-       while (1) {
-               switch(i) {
+\twhile (1) {
+\t\tswitch(i) {
 (END)
 
        my($i) = 0;
        foreach $structname (@idl) {
                my(@var) = (@{$structname->{"var"}});
 print OUTFILE << "(END)";
-                       /* $structname->{"name"} */
-                       case $i:
-                               printf("$structname->{"name"}:\\n");
+\t\t\t/* $structname->{"name"} */
+\t\t\tcase $i:
+\t\t\t\tprintf("$structname->{"name"}:\\n");
 (END)
                foreach $var (@var) {
                        if ($var->{"type"} eq "double") {
 print OUTFILE << "(END)";
-                               orte->$structname->{"name"}.$var->{"name"} = ($var->{"type"})(rand());
-                               printf("\\t$var->{"name"} = %f\\n", orte->$structname->{"name"}.$var->{"name"});
+\t\t\t\torte->$structname->{"name"}.$var->{"name"} = ($var->{"type"})(rand());
+\t\t\t\tprintf("\\t$var->{"name"} = %f\\n", orte->$structname->{"name"}.$var->{"name"});
 (END)
                        } elsif ( $var->{"type"} eq "octet" ) {
 print OUTFILE << "(END)";
-                               orte->$structname->{"name"}.$var->{"name"} = (unsigned char)(rand());
-                               printf("\\t$var->{"name"} = 0x%02x\\n", orte->$structname->{"name"}.$var->{"name"});
+\t\t\t\torte->$structname->{"name"}.$var->{"name"} = (unsigned char)(rand());
+\t\t\t\tprintf("\\t$var->{"name"} = 0x%02x\\n", orte->$structname->{"name"}.$var->{"name"});
 (END)
                        } elsif ( $var->{"type"} eq "unsigned short" ) {
 print OUTFILE << "(END)";
-                               orte->$structname->{"name"}.$var->{"name"} = ($var->{"type"})(rand());
-                               printf("\\t$var->{"name"} = %d\\n", orte->$structname->{"name"}.$var->{"name"});
+\t\t\t\torte->$structname->{"name"}.$var->{"name"} = ($var->{"type"})(rand());
+\t\t\t\tprintf("\\t$var->{"name"} = %d\\n", orte->$structname->{"name"}.$var->{"name"});
 (END)
                        } else {
 print OUTFILE << "(END)";
-                               orte->$structname->{"name"}.$var->{"name"} = (int)(rand());
-                               printf("\\t$var->{"name"} = %d\\n", orte->$structname->{"name"}.$var->{"name"});
+\t\t\t\torte->$structname->{"name"}.$var->{"name"} = (int)(rand());
+\t\t\t\tprintf("\\t$var->{"name"} = %d\\n", orte->$structname->{"name"}.$var->{"name"});
 (END)
                        }
                }
 
                if (defined($publication_callback_enabled)) {
 print OUTFILE << "(END)";
-                               /*ORTEPublicationSend(orte->$publication_prefix$structname->{"name"});*/
-                               break;
+\t\t\t\t/*ORTEPublicationSend(orte->$publication_prefix$structname->{"name"});*/
+\t\t\t\tbreak;
 
 (END)
                } else {
 print OUTFILE << "(END)";
-                               ORTEPublicationSend(orte->$publication_prefix$structname->{"name"});
-                               break;
+\t\t\t\tORTEPublicationSend(orte->$publication_prefix$structname->{"name"});
+\t\t\t\tbreak;
 
 (END)
                }
@@ -592,13 +592,13 @@ print OUTFILE << "(END)";
        }
 
 print OUTFILE << "(END)";
-                       default:
-                               break;
-               }
-               i++;
-               i = i % $i;
-               usleep($publisher_thread_usleep);
-       }
+\t\t\tdefault:
+\t\t\t\tbreak;
+\t\t}
+\t\ti++;
+\t\ti = i % $i;
+\t\tusleep($publisher_thread_usleep);
+\t}
 }
 
 /* Start thread */
@@ -642,12 +642,12 @@ print OUTFILE << "(END)";
 
 print OUTFILE << "(END)";
 
-       printf("Publishers: sending data.\\n");
+\tprintf("Publishers: sending data.\\n");
 
-       /* start thread and do the job */
-       start_thread(&orte);
+\t/* start thread and do the job */
+\tstart_thread(&orte);
 
-       return 0;
+\treturn 0;
 }
 
 (END)
@@ -691,14 +691,14 @@ print OUTFILE << "(END)";
 
 void print_time()
 {
-       struct timeval tv;
-       time_t curtime;
-       char buffer[30];
-
-       gettimeofday(&tv, NULL);
-       curtime = tv.tv_sec;
-       strftime(buffer, 30, "[%T.", localtime(&curtime));
-       printf("%s%ld]\\n", buffer, tv.tv_usec);
+\tstruct timeval tv;
+\ttime_t curtime;
+\tchar buffer[30];
+
+\tgettimeofday(&tv, NULL);
+\tcurtime = tv.tv_sec;
+\tstrftime(buffer, 30, "[%T.", localtime(&curtime));
+\tprintf("%s%ld]\\n", buffer, tv.tv_usec);
 }
 
 /* ---------------------------------------------------------------------- 
@@ -710,46 +710,46 @@ void print_time()
        foreach $structname (@idl) {
 print OUTFILE << "(END)";
 void rcv_$structname->{"name"}_cb(const ORTERecvInfo *info, void *vinstance,
-                        void *recvCallBackParam)
+\t\t\tvoid *recvCallBackParam)
 {
-        struct $roboorte_name\_orte_data *orte = 
-                       (struct $roboorte_name\_orte_data *)recvCallBackParam;
-
-        switch (info->status) {
-                case NEW_DATA:
+\tstruct $roboorte_name\_orte_data *orte = 
+\t\t\t(struct $roboorte_name\_orte_data *)recvCallBackParam;
+\t
+\tswitch (info->status) {
+\t\tcase NEW_DATA:
 (END)
                if (defined($subscriber_print_data)) {
 print OUTFILE << "(END)";
-                       print_time();
-                       printf("\\t$structname->{"name"}:\\n");
+\t\t\tprint_time();
+\t\t\tprintf("\\t$structname->{"name"}:\\n");
 (END)
                        my(@var) = (@{$structname->{"var"}});
                        foreach $var (@var) {
 print OUTFILE << "(END)";
-                               printf("\\t\\t");
+\t\t\t\tprintf("\\t\\t");
 (END)
                                if ($var->{"type"} eq "double") {
 print OUTFILE << "(END)";
-                       printf("$var->{"name"} = %f\\n", orte->$structname->{"name"}.$var->{"name"});
+\t\t\t\tprintf("$var->{"name"} = %f\\n", orte->$structname->{"name"}.$var->{"name"});
 (END)
                                } elsif ( $var->{"type"} eq "octet" ) {
 print OUTFILE << "(END)";
-                       printf("$var->{"name"} = 0x%02x\\n", orte->$structname->{"name"}.$var->{"name"});
+\t\t\t\tprintf("$var->{"name"} = 0x%02x\\n", orte->$structname->{"name"}.$var->{"name"});
 (END)
                                } else {
 print OUTFILE << "(END)";
-                       printf("$var->{"name"} = %d\\n", orte->$structname->{"name"}.$var->{"name"});
+\t\t\t\tprintf("$var->{"name"} = %d\\n", orte->$structname->{"name"}.$var->{"name"});
 (END)
                                }
                        }
                }
                         
 print OUTFILE << "(END)";
-                        break;
-                case DEADLINE:
-                        printf("ORTE deadline occurred - $structname->{"name"} receive\\n");
-                        break;
-        }
+\t\t\tbreak;
+\t\tcase DEADLINE:
+\t\t\tprintf("ORTE deadline occurred - $structname->{"name"} receive\\n");
+\t\t\tbreak;
+\t}
 }
 
 (END)
@@ -775,17 +775,17 @@ print OUTFILE << "(END)";
 
        unless (defined($subscriber_print_data)) {
 print OUTFILE << "(END)";
-       printf("Subscribers: debug print turned off.\\n");
+\tprintf("Subscribers: debug print turned off.\\n");
 (END)
        }
 print OUTFILE << "(END)";
 
-       printf("Subscribers: waiting for data.\\n");
-       while (1) {
-               usleep($subscriber_wait_usleep);
-       }
+\tprintf("Subscribers: waiting for data.\\n");
+\twhile (1) {
+\t\tusleep($subscriber_wait_usleep);
+\t}
 
-       return 0;
+\treturn 0;
 }
 
 (END)