From: Petr Benes <benesp16@fel.cvut.cz>
Date: Tue, 22 Feb 2011 09:54:47 +0000 (+0100)
Subject: forb: added scripts executing dynamic shared libraries
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/frsh-forb.git/commitdiff_plain/0472cc5322c0e2d0e0d5e636bbf68badeabeb31d

forb: added scripts executing dynamic shared libraries

The scripts are responsible for a backward compatibility.
orb_id is now being passed to forbrun from the scripts.

However, the scripts do not pass the make. Omk accepts .sh
extension instead of no extension scripts.

Minor bugs fixed also.
---

diff --git a/src/frsh/fres/cbroker/Makefile.omk b/src/frsh/fres/cbroker/Makefile.omk
index efcd8aab..55015f51 100644
--- a/src/frsh/fres/cbroker/Makefile.omk
+++ b/src/frsh/fres/cbroker/Makefile.omk
@@ -18,6 +18,8 @@ default_CONFIG += CONFIG_FCB=y	# Hack to let FORB automatically register referen
 
 LOCAL_CONFIG_H = fcb_config.h
 
+bin_SCRIPTS += fcb
+
 # include-pass_HOOKS = fcb_contract_gavl.inc
 
 # fcb_contract_gavl.inc: $(SOURCES_DIR)/fcb_contract_gavl.c
diff --git a/src/frsh/fres/cbroker/fcb b/src/frsh/fres/cbroker/fcb
new file mode 100755
index 00000000..2594e3ee
--- /dev/null
+++ b/src/frsh/fres/cbroker/fcb
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./forbrun -i "org.frescor.fcb" ../lib/libcbroker.so "$@"
diff --git a/src/frsh/fres/cbroker/fcb.c b/src/frsh/fres/cbroker/fcb.c
index f931d2eb..489dbe43 100644
--- a/src/frsh/fres/cbroker/fcb.c
+++ b/src/frsh/fres/cbroker/fcb.c
@@ -1493,7 +1493,6 @@ int forb_main(forb_orb orb, int argc, char *argv[])
 	forb_executor_t executor;
 	int ret;
 	forb_init_attr_t attr = {
-		.orb_id = "org.frescor.fcb",
 		.peer_discovery_callback = peer_discovery_callback,
 		.peer_dead_callback = peer_dead_callback,
 		.fixed_tcp_port = FCB_TCP_PORT,
@@ -1528,8 +1527,7 @@ int forb_main(forb_orb orb, int argc, char *argv[])
 	memset(&fcb_data, 0, sizeof(fcb_data));
 	fosa_clock_get_time(CLOCK_REALTIME, &start_time);
 
-	if (opt_daemon)
-		forb_daemon_prepare(opt_pidfile);
+
 
 #if CONFIG_FCB_INET && !CONFIG_FORB_PROTO_INET_DEFAULT
 	ret = register_inet_port(orb);
diff --git a/src/frsh/resources/cluster_tree/Makefile.omk b/src/frsh/resources/cluster_tree/Makefile.omk
index 2d3a5765..f05d9d64 100644
--- a/src/frsh/resources/cluster_tree/Makefile.omk
+++ b/src/frsh/resources/cluster_tree/Makefile.omk
@@ -17,4 +17,6 @@ frm_cluster_tree_LIBS = frm forb contract fosa rt ulut fcb_client m
 include_HEADERS = cluster_tree.h
 include_GEN_HEADERS = cluster_tree_idl.h
 
+bin_SCRIPTS += cluster_tree
+
 endif 
diff --git a/src/frsh/resources/cluster_tree/frm_cluster_tree b/src/frsh/resources/cluster_tree/frm_cluster_tree
new file mode 100755
index 00000000..3fcb12e3
--- /dev/null
+++ b/src/frsh/resources/cluster_tree/frm_cluster_tree
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./forbrun -i "org.frescor.frm.cluster_tree" ../lib/libfrm_cluster_tree.so "$@"
diff --git a/src/frsh/resources/cluster_tree/frm_cluster_tree.c b/src/frsh/resources/cluster_tree/frm_cluster_tree.c
index edf7a936..785e233d 100644
--- a/src/frsh/resources/cluster_tree/frm_cluster_tree.c
+++ b/src/frsh/resources/cluster_tree/frm_cluster_tree.c
@@ -169,8 +169,6 @@ static const struct fres_res_manager frm = {
 int forb_main(forb_orb orb, int argc, char *argv[])
 {
 	int ret;
-	forb_init_attr_t attr = { .orb_id = "org.frescor.frm.cluster_tree" };
-
 	fres_block_register_cluster_tree();
 
 	ret = frm_register_and_run(orb, &frm);
diff --git a/src/frsh/resources/cpu_aquosa/mngr/Makefile.omk b/src/frsh/resources/cpu_aquosa/mngr/Makefile.omk
index 79f6cc8a..5a647534 100644
--- a/src/frsh/resources/cpu_aquosa/mngr/Makefile.omk
+++ b/src/frsh/resources/cpu_aquosa/mngr/Makefile.omk
@@ -4,3 +4,5 @@ LOADLIBES += -L $(AQUOSA_ROOT)/lib -lqreslib -lqsuplib
 LOADLIBES += -Xlinker -rpath -Xlinker $(AQUOSA_ROOT)/lib
 frm_aqcpu_LIBS = frm forb contract fosa rt ulut fcb_client qreslib qsuplib
 lib_LOADLIBES+= frsh
+
+bin_SCRIPTS += frm_aqcpu
\ No newline at end of file
diff --git a/src/frsh/resources/cpu_aquosa/mngr/frm_aqcpu b/src/frsh/resources/cpu_aquosa/mngr/frm_aqcpu
new file mode 100755
index 00000000..3d945a4e
--- /dev/null
+++ b/src/frsh/resources/cpu_aquosa/mngr/frm_aqcpu
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./forbrun -i "org.frescor.frm.aqcpu" ../lib/libfrm_aqcpu.so "$@"
diff --git a/src/frsh/resources/cpu_aquosa/mngr/frm_aqcpu.c b/src/frsh/resources/cpu_aquosa/mngr/frm_aqcpu.c
index 51c32d78..2c6d8c47 100644
--- a/src/frsh/resources/cpu_aquosa/mngr/frm_aqcpu.c
+++ b/src/frsh/resources/cpu_aquosa/mngr/frm_aqcpu.c
@@ -122,7 +122,6 @@ usage(void)
 int forb_main(forb_orb orb, int argc, char *argv[])
 {
 	int ret;
-	forb_init_attr_t attr = { .orb_id = "org.frescor.frm.aqcpu" };
 	int  opt;
 	bool opt_daemon = false;
 	char *opt_pidfile = NULL;
diff --git a/src/frsh/resources/cpucg/mngr/Makefile.omk b/src/frsh/resources/cpucg/mngr/Makefile.omk
index 6cb7aebe..db8c82da 100644
--- a/src/frsh/resources/cpucg/mngr/Makefile.omk
+++ b/src/frsh/resources/cpucg/mngr/Makefile.omk
@@ -2,3 +2,5 @@ shared_LIBRARIES = frm_cgcpu
 frm_cgcpu_SOURCES = frm_cgcpu.c
 frm_cgcpu_LIBS = frm forb contract fosa rt ulut fcb_client
 lib_LOADLIBES+= frsh
+
+bin_SCRIPTS += frm_cgcpu
\ No newline at end of file
diff --git a/src/frsh/resources/cpucg/mngr/frm_cgcpu b/src/frsh/resources/cpucg/mngr/frm_cgcpu
new file mode 100755
index 00000000..2a224f9d
--- /dev/null
+++ b/src/frsh/resources/cpucg/mngr/frm_cgcpu
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./forbrun -i "org.frescor.frm.cgcpu" ../lib/libfrm_cgcpu.so "$@"
diff --git a/src/frsh/resources/cpucg/mngr/frm_cgcpu.c b/src/frsh/resources/cpucg/mngr/frm_cgcpu.c
index 00b7b8d8..a48ec0be 100644
--- a/src/frsh/resources/cpucg/mngr/frm_cgcpu.c
+++ b/src/frsh/resources/cpucg/mngr/frm_cgcpu.c
@@ -132,7 +132,6 @@ int forb_main(forb_orb orb, int argc, char *argv[])
 	FILE* fd;
 	int ret;
 	int  opt;
-	forb_init_attr_t attr = { .orb_id = "org.frescor.frm.cgcpu" };
 	bool opt_daemon = false;
 	char *opt_pidfile = NULL;
 
diff --git a/src/frsh/resources/dummy/Makefile.omk b/src/frsh/resources/dummy/Makefile.omk
index f29d52c1..b571dbb0 100644
--- a/src/frsh/resources/dummy/Makefile.omk
+++ b/src/frsh/resources/dummy/Makefile.omk
@@ -14,3 +14,5 @@ fra_dummy_CLIENT_IDL = res_dummy_idl.idl
 
 include_HEADERS = res_dummy.h
 include_GEN_HEADERS = res_dummy_idl.h
+
+bin_SCRIPTS += frm_dummy
\ No newline at end of file
diff --git a/src/frsh/resources/dummy/frm_dummy b/src/frsh/resources/dummy/frm_dummy
new file mode 100755
index 00000000..1d474cc6
--- /dev/null
+++ b/src/frsh/resources/dummy/frm_dummy
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./forbrun -i "org.frescor.frm.dummy" ../lib/libfrm_dummy.so "$@"
diff --git a/src/frsh/resources/dummy/frm_dummy.c b/src/frsh/resources/dummy/frm_dummy.c
index 1314d03f..441f9b10 100644
--- a/src/frsh/resources/dummy/frm_dummy.c
+++ b/src/frsh/resources/dummy/frm_dummy.c
@@ -163,7 +163,7 @@ static struct fres_res_manager frm = {
 
 static struct option long_opts[] = {
     { "loglevel", 1, 0, 'l' },
-//     { "id", 	  required_argument, 0, 'i' },
+    { "id", 	  required_argument, 0, 'i' },
     { "accept-all", 0, 0, 'a' },
     { "help", 0, 0, 'h' },
     { 0, 0, 0, 0}
@@ -175,7 +175,7 @@ usage(void)
 	printf("usage: frm_dummy [ options ]\n");
 	printf("  -a, --accept-all   Accepts all contracts\n");
 	printf("  -d, --daemon [pid-file]   go to background after FORB initialization\n");
-/*	printf("  -i, --id <resource id>    Use a different id that the default (%d)\n", DUMMY_RESOURCE_ID);*/
+	printf("  -i, --id <resource id>    Use a different id that the default (%d)\n", DUMMY_RESOURCE_ID);
 	printf("  -h, --help         Display this help\n");
 	printf("  -l, --loglevel <number>|<domain>=<number>,...\n");
 }
@@ -183,7 +183,6 @@ usage(void)
 int forb_main(forb_orb orb, int argc, char *argv[])
 {
 	int ret;
-	forb_init_attr_t attr = { .orb_id = "org.frescor.frm.dummy" };
 	int  opt;
 
 	while ((opt = getopt_long(argc, argv, "ai:l:h", &long_opts[0], NULL)) != EOF) {
@@ -194,9 +193,9 @@ int forb_main(forb_orb orb, int argc, char *argv[])
 				opt_daemon = true;
 				opt_pidfile = optarg;
 				break;
-// 			case 'i':
-// 				opt_res_id = atoi(optarg);
-// 				break;
+ 			case 'i':
+ 				opt_res_id = atoi(optarg);
+ 				break;
 			case 'l':
 				ul_log_domain_arg2levels(optarg);
 				break;
diff --git a/src/frsh/resources/fpga/Makefile.omk b/src/frsh/resources/fpga/Makefile.omk
index 7cdeca81..f9d0977a 100644
--- a/src/frsh/resources/fpga/Makefile.omk
+++ b/src/frsh/resources/fpga/Makefile.omk
@@ -16,4 +16,6 @@ fra_fpga_CLIENT_IDL = res_fpga_idl.idl
 
 include_HEADERS = res_fpga.h
 include_GEN_HEADERS = res_fpga_idl.h
+
+bin_SCRIPTS += fpga
 endif
diff --git a/src/frsh/resources/fpga/frm_fpga b/src/frsh/resources/fpga/frm_fpga
new file mode 100755
index 00000000..6e5da6f5
--- /dev/null
+++ b/src/frsh/resources/fpga/frm_fpga
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./forbrun -i "org.frescor.frm.fpga" ../lib/libfrm_fpga.so "$@"
diff --git a/src/frsh/resources/fpga/frm_fpga.c b/src/frsh/resources/fpga/frm_fpga.c
index 2609e106..c78c472e 100644
--- a/src/frsh/resources/fpga/frm_fpga.c
+++ b/src/frsh/resources/fpga/frm_fpga.c
@@ -113,7 +113,6 @@ static const struct fres_res_manager frm = {
 int forb_main(forb_orb orb, int argc, char *argv[])
 {
 	int ret;
-	forb_init_attr_t attr = { .orb_id = "org.frescor.frm.fpga" };
 
 	/* Register fres_block_fpga to contract handling
 	 * functions */
diff --git a/src/frsh/resources/item/Makefile.omk b/src/frsh/resources/item/Makefile.omk
index aec0af99..435f3c29 100644
--- a/src/frsh/resources/item/Makefile.omk
+++ b/src/frsh/resources/item/Makefile.omk
@@ -16,5 +16,7 @@ fra_item_CLIENT_IDL = item_idl.idl
 include_HEADERS = item.h
 include_GEN_HEADERS = item_idl.h
 
+bin_SCRIPTS += item
+
 SUBDIRS=tests
 endif
diff --git a/src/frsh/resources/item/frm_item b/src/frsh/resources/item/frm_item
new file mode 100755
index 00000000..b5dfb37c
--- /dev/null
+++ b/src/frsh/resources/item/frm_item
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./forbrun -i "org.frescor.frm.item" ../lib/libfrm_item.so "$@"
diff --git a/src/frsh/resources/item/frm_item.c b/src/frsh/resources/item/frm_item.c
index 04eb8509..6ab2ee23 100644
--- a/src/frsh/resources/item/frm_item.c
+++ b/src/frsh/resources/item/frm_item.c
@@ -238,8 +238,6 @@ int forb_main(forb_orb orb, int argc, char *argv[])
 	char platform[]="telosb";	
 	char *parametrsITEM[] ={NULL,device,platform};
 
-	forb_init_attr_t attr = { .orb_id = "org.frescor.frm.item" };
-
 	fres_block_register_item();