forb: script invocation of shlibs fixec

A couple of different small fixes at once.

diff --git a/fres/cbroker/fcb b/fres/cbroker/fcb
index 81d79c8d9cacbca77c625de60edf8da9f011fa9f..6838426750c3c216b54d0fac44cdcd17115b4e7d 100755 (executable)
--- a/fres/cbroker/fcb
+++ b/fres/cbroker/fcb
@@ -7,9 +7,9 @@ while [ $# -gt 0 ]; do
        --daemon)
            FORBRUN_ARGS="$FORBRUN_ARGS $1 $2"; shift;;
        *)
-           FCB_ARGS="$FCB_ARGS '$1'"
+           FCB_ARGS="$FCB_ARGS $1"
     esac
     shift
 done
 
-forbrun -i "org.frescor.fcb" -s 1111111111111111 $FORBRUN_ARGS -- libfcb.so $FCB_ARGS 
+forbrun -i "org.frescor.fcb" -s 1111111111111111 -p 24942 $FORBRUN_ARGS -- libfcb.so $FCB_ARGS 

diff --git a/fres/cbroker/fcb.c b/fres/cbroker/fcb.c
index 489dbe43c074983936cd02a8b0f5ce9b42655062..0bd1bb46264953ce82df24d2a8e0b5587cfa2b44 100644 (file)
--- a/fres/cbroker/fcb.c
+++ b/fres/cbroker/fcb.c
@@ -324,6 +324,7 @@ GAVL_CUST_NODE_INT_IMP(fcb_contract         /* cust_prefix */,              \
                       fres_contract_id_cmp /* cust_cmp_fnc */);
 #else
 #include "fcb_contract_gavl.inc"
+#include <forb/forb.h>
 #endif
 
 static inline int
@@ -1492,15 +1493,6 @@ int forb_main(forb_orb orb, int argc, char *argv[])
        fres_contract_broker fcb;
        forb_executor_t executor;
        int ret;
-       forb_init_attr_t attr = {
-               .peer_discovery_callback = peer_discovery_callback,
-               .peer_dead_callback = peer_dead_callback,
-               .fixed_tcp_port = FCB_TCP_PORT,
-#ifdef CONFIG_FORB_PROTO_INET_DEFAULT          
-               .fixed_server_id = FCB_SERVER_ID,
-               .redistribute_hellos = true,
-#endif
-       };
        int  opt;
 
        while ((opt = getopt_long(argc, argv, "hl:", &long_opts[0], NULL)) != EOF) {
@@ -1553,8 +1545,8 @@ int forb_main(forb_orb orb, int argc, char *argv[])
        if (ret) error(1, errno, "forb_register_reference() failed");
 
        ul_logmsg("Waiting for requests\n");
-       if (opt_daemon)
-               forb_daemon_ready();
+       
+       forb_signal_server_ready(orb);
 
        ret = forb_executor_run(&executor);
        if (ret) error(1, errno, "forb_executor_run failed");

diff --git a/resources/cluster_tree/frm_cluster_tree b/resources/cluster_tree/frm_cluster_tree
index 733168ac75f6e4cbf7473370992d4f7de9f2e1da..61df92360a9c2e7c27fc2e52e0cae7500d2920fd 100755 (executable)
--- a/resources/cluster_tree/frm_cluster_tree
+++ b/resources/cluster_tree/frm_cluster_tree
@@ -1,3 +1,15 @@
 #!/bin/sh
 
-forbrun -i "org.frescor.frm.cluster_tree" -- libfrm_cluster_tree.so "$@"
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -d*|--daemon=)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1";;
+        --daemon)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1 $2"; shift;;
+        *)
+            FRM_ARGS="$FRM_ARGS $1"
+    esac
+    shift
+done
+
+forbrun -i "org.frescor.frm.cluster_tree" $FORBRUN_ARGS -- libfrm_cluster_tree.so $FRM_ARGS 

diff --git a/resources/cpu_aquosa/mngr/Makefile.omk b/resources/cpu_aquosa/mngr/Makefile.omk
index 5a647534ff1e641dcd8a1856103f7928cba7d649..7e8c52ece79a5c5a8014018c397c7c26c775603e 100644 (file)
--- a/resources/cpu_aquosa/mngr/Makefile.omk
+++ b/resources/cpu_aquosa/mngr/Makefile.omk
@@ -1,4 +1,4 @@
-shared_LIBRARIES = frm_aqcpu
+shared_LIBRARIES += frm_aqcpu
 frm_aqcpu_SOURCES = frm_aqcpu.c
 LOADLIBES += -L $(AQUOSA_ROOT)/lib -lqreslib -lqsuplib
 LOADLIBES += -Xlinker -rpath -Xlinker $(AQUOSA_ROOT)/lib

diff --git a/resources/cpu_aquosa/mngr/frm_aqcpu b/resources/cpu_aquosa/mngr/frm_aqcpu
index c6e656dc98a48f4aa2ec4703f7a59090f3ea15ac..b95ec218a0368ef7172890231617701fef7d3dfb 100755 (executable)
--- a/resources/cpu_aquosa/mngr/frm_aqcpu
+++ b/resources/cpu_aquosa/mngr/frm_aqcpu
@@ -1,3 +1,15 @@
 #!/bin/sh
 
-forbrun -i "org.frescor.frm.aqcpu" -- libfrm_aqcpu.so "$@"
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -d*|--daemon=)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1";;
+        --daemon)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1 $2"; shift;;
+        *)
+            FRM_ARGS="$FRM_ARGS $1"
+    esac
+    shift
+done
+
+forbrun -i "org.frescor.frm.aqcpu" $FORBRUN_ARGS -- libfrm_aqcpu.so $FRM_ARGS 

diff --git a/resources/cpucg/mngr/Makefile.omk b/resources/cpucg/mngr/Makefile.omk
index db8c82daf08d6c0c313faccba9e083996a7adbd4..30fdafc2c15d43b03697fd52c28c5a4fc6be3c99 100644 (file)
--- a/resources/cpucg/mngr/Makefile.omk
+++ b/resources/cpucg/mngr/Makefile.omk
@@ -1,6 +1,5 @@
-shared_LIBRARIES = frm_cgcpu
+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
+bin_SCRIPTS = frm_cgcpu
\ No newline at end of file

diff --git a/resources/cpucg/mngr/frm_cgcpu b/resources/cpucg/mngr/frm_cgcpu
index 5e0cce39bf038fe7762cff152ddca59e03e1aa78..db16e0572f7160635fd5ebfa3788ecd40fc3ac7f 100755 (executable)
--- a/resources/cpucg/mngr/frm_cgcpu
+++ b/resources/cpucg/mngr/frm_cgcpu
@@ -1,3 +1,15 @@
 #!/bin/sh
 
-forbrun -i "org.frescor.frm.cgcpu" -- libfrm_cgcpu.so "$@"
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -d*|--daemon=)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1";;
+        --daemon)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1 $2"; shift;;
+        *)
+            FRM_ARGS="$FRM_ARGS $1"
+    esac
+    shift
+done
+
+forbrun -i "org.frescor.frm.cgcpu" $FORBRUN_ARGS -- libfrm_cgcpu.so $FRM_ARGS 

diff --git a/resources/disk_bfq/mngr/Makefile.omk b/resources/disk_bfq/mngr/Makefile.omk
index 4a73fd98d9cf66b8c8236fc02516f70930861eb9..0fbbe18a60b10b7de817ea584ef403103abb2153 100644 (file)
--- a/resources/disk_bfq/mngr/Makefile.omk
+++ b/resources/disk_bfq/mngr/Makefile.omk
@@ -7,3 +7,4 @@ frm_diskbfq_LIBS = frm forb contract fosa m rt ulut fcb_client frshdiskbfq
 
 include_HEADERS = diskbfq_th.h
 
+bin_SCRIPTS = frm_diskbfq

diff --git a/resources/disk_bfq/mngr/diskbfq_mngr.c b/resources/disk_bfq/mngr/diskbfq_mngr.c
index c1a42406d76ef4114e36e676172bd68a4f9e14e8..5e0379b0bf2532ac1e7dc835f898cc00e96536e9 100644 (file)
--- a/resources/disk_bfq/mngr/diskbfq_mngr.c
+++ b/resources/disk_bfq/mngr/diskbfq_mngr.c
@@ -177,7 +177,6 @@ static struct fres_res_manager frm = {
 
 int forb_main(forb_orb orb, int argc, char *argv[])
 {
-       forb_init_attr_t attr = { .orb_id = "org.frescor.frm.diskbfq" };
        FILE* fd;
        int readers = 4;
        char disk_dev[40] = {0}, *disk_name = disk_dev;

diff --git a/resources/dummy/Makefile.omk b/resources/dummy/Makefile.omk
index b571dbb0943c765575f589ae8f772173be985156..b3a2b1e2646289819c4d6b9412ae2628df3a1a79 100644 (file)
--- a/resources/dummy/Makefile.omk
+++ b/resources/dummy/Makefile.omk
@@ -7,7 +7,7 @@ frm_dummy_SOURCES = frm_dummy.c dummy_block.c
 frm_dummy_CLIENT_IDL = res_dummy_idl.idl
 frm_dummy_LIBS = frm forb contract fosa rt ulut fcb_client
 
-shared_LIBRARIES = fra_dummy
+shared_LIBRARIES += fra_dummy
 fra_dummy_SOURCES = fra_dummy.c dummy_block.c
 fra_dummy_LIBS = fra
 fra_dummy_CLIENT_IDL = res_dummy_idl.idl

diff --git a/resources/dummy/frm_dummy b/resources/dummy/frm_dummy
index 62ffdf6adce5900211372d6124e19efe051279dd..8796aad35eda1bf863510a259d51586df24ce185 100755 (executable)
--- a/resources/dummy/frm_dummy
+++ b/resources/dummy/frm_dummy
@@ -1,3 +1,16 @@
 #!/bin/sh
 
-forbrun -i "org.frescor.frm.dummy" -- libfrm_dummy.so "$@"
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -d*|--daemon=)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1";;
+        --daemon)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1 $2"; shift;;
+        *)
+            FRM_ARGS="$FRM_ARGS $1"
+    esac
+    shift
+done
+
+forbrun -i "org.frescor.frm.dummy" $FORBRUN_ARGS -- libfrm_dummy.so $FRM_ARGS 

diff --git a/resources/fpga/Makefile.omk b/resources/fpga/Makefile.omk
index 77063f020e6e38a1befe53cce7403e7b5c0d63da..7e44f54172c7e3e31bddad32cf3edc01dcdd15b1 100644 (file)
--- a/resources/fpga/Makefile.omk
+++ b/resources/fpga/Makefile.omk
@@ -9,7 +9,7 @@ frm_fpga_SOURCES = frm_fpga.c fpga_block.c
 frm_fpga_CLIENT_IDL = res_fpga_idl.idl
 frm_fpga_LIBS = frm forb contract fosa rt ulut fcb_client
 
-shared_LIBRARIES = fra_fpga
+shared_LIBRARIES += fra_fpga
 fra_fpga_SOURCES = fra_fpga.c fpga_block.c
 fra_fpga_LIBS = fra
 fra_fpga_CLIENT_IDL = res_fpga_idl.idl

diff --git a/resources/fpga/frm_fpga b/resources/fpga/frm_fpga
index c8628bc7cf53ae7f380ce97fdee503c6acbe105f..e79b1a1f57b932ea5bd518c8a0960dbaf72d35d8 100755 (executable)
--- a/resources/fpga/frm_fpga
+++ b/resources/fpga/frm_fpga
@@ -1,3 +1,16 @@
 #!/bin/sh
 
-forbrun -i "org.frescor.frm.fpga" -- libfrm_fpga.so "$@"
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -d*|--daemon=)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1";;
+        --daemon)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1 $2"; shift;;
+        *)
+            FRM_ARGS="$FRM_ARGS $1"
+    esac
+    shift
+done
+
+forbrun -i "org.frescor.frm.fpga" $FORBRUN_ARGS -- libfrm_fpga.so $FRM_ARGS 
+

diff --git a/resources/item/Makefile.omk b/resources/item/Makefile.omk
index e8824bc5be7124166519f6dceb662053944b9603..95f30d7891561df6a2dd2ae39089a039f674fc5c 100644 (file)
--- a/resources/item/Makefile.omk
+++ b/resources/item/Makefile.omk
@@ -8,7 +8,7 @@ frm_item_SOURCES = frm_item.c item_blocks.c FWSN.c serialsource.c
 frm_item_SERVER_IDL = item_idl.idl
 frm_item_LIBS = frm forb contract fosa rt ulut fcb_client m
 
-shared_LIBRARIES = fra_item
+shared_LIBRARIES += fra_item
 fra_item_SOURCES = item_blocks.c fra_item.c
 fra_item_LIBS = fra
 fra_item_CLIENT_IDL = item_idl.idl

diff --git a/resources/item/frm_item b/resources/item/frm_item
index 7c1d393e7eb22c5f8f36d4ae58a2f882a8764aa3..ac16ca976171499241e2fb742dbb0283f37555b4 100755 (executable)
--- a/resources/item/frm_item
+++ b/resources/item/frm_item
@@ -1,3 +1,16 @@
 #!/bin/sh
 
-forbrun -i "org.frescor.frm.item" -- lib/libfrm_item.so "$@"
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -d*|--daemon=)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1";;
+        --daemon)
+            FORBRUN_ARGS="$FORBRUN_ARGS $1 $2"; shift;;
+        *)
+            FRM_ARGS="$FRM_ARGS $1"
+    esac
+    shift
+done
+
+forbrun -i "org.frescor.frm.item" $FORBRUN_ARGS -- libfrm_item.so $FRM_ARGS 
+