#include <errno.h>
#include <stdio.h>
#include <ul_log.h>
+#include <ul_logreg.h>
#include <stdbool.h>
#include <dlfcn.h>
#include <forb/forb-internal.h>
static struct option long_opts[] = {
{ "daemon", optional_argument, NULL, 'd' },
{ "id", required_argument, NULL, 'i' },
-/* { "loglevel", required_argument, NULL, 'l' }, */
+ { "loglevel", required_argument, NULL, 'l' },
{ "port", required_argument, NULL, 'p' },
{ 0, 0, 0, 0}
};
static void
usage(void)
{
- printf("usage: forbrun [ options ] <forb-server>.so ... [-- <options for forb_main()>] \n");
+ printf("usage: forbrun [ options ] -- <forb-server>.so [ options for forb_main() ] [-- ...]\n");
printf(" -d, --daemon [pid-file] go to background after initialization of servers\n");
- printf(" -i, --id <orb id> \n");
-/* printf(" -l, --loglevel <number>|<domain>=<number>,...\n"); */
+ printf(" -i, --id <textual orb id>\n");
+ printf(" -l, --loglevel <number>|<domain>=<number>,...\n");
printf(" -p, --port <number> listen on a fixed port number\n");
}
struct forb_main_data *data = arg;
int ret;
ret = data->forb_main(data->orb, data->argc, data->argv);
+ free(data);
exit(ret);
return NULL;
}
char *opt_pidfile = NULL;
int i;
forb_init_attr_t attr = {
- .orb_id = "org.frescor.fcb",
+ .orb_id = "",
.peer_discovery_callback = NULL, /* TODO */
.peer_dead_callback = NULL, /* TODO */
.fixed_tcp_port = 0,
while ((opt = getopt_long(argc, argv, "d::hil:p:x", &long_opts[0], NULL)) != EOF) {
switch (opt) {
-#if 0
case 'l':
if (*optarg == '?') {
ul_logreg_for_each_domain(print_log_domain, NULL);
error(1, EINVAL, "Error parsing -l argument at char %d\n", ret);
}
break;
-#endif
case 'd':
opt_daemon = true;
opt_pidfile = optarg;
for (i = optind; i < argc; i++) {
void *handle;
fosa_thread_id_t tid;
- struct forb_main_data data;
+ struct forb_main_data *data = malloc(sizeof(*data));
- data.filename = argv[i];
- handle = dlopen(data.filename, RTLD_LOCAL|RTLD_LAZY);
+ data->filename = argv[i];
+ handle = dlopen(data->filename, RTLD_LOCAL|RTLD_LAZY);
if (!handle)
- error(1, errno, "dlopen(\"%s\") failed", data.filename);
- data.forb_main = dlsym(handle, "forb_main");
- if (!data.forb_main)
- error(1, errno, "Cannot find forb_main() in %s", data.filename);
+ error(1, errno, "dlopen(\"%s\") failed", data->filename);
+ data->forb_main = dlsym(handle, "forb_main");
+ if (!data->forb_main)
+ error(1, errno, "Cannot find forb_main() in %s", data->filename);
- data.orb = orb;
+ data->orb = orb;
- // parse forb parameters
- data.argc = 1;
- data.argv = &argv[i];
- while (i+1 < argc) {
+ // prepare forb_main() parameters
+ data->argc = 0;
+ data->argv = &argv[i];
+ while (i < argc && strcmp(argv[i], "--")) {
i++;
- if (!strcmp(argv[i], "--"))
- break;
- else
- data.argc++;
+ data->argc++;
}
- fosa_thread_create(&tid, NULL, forb_main_thread, &data);
+
+ fosa_thread_create(&tid, NULL, forb_main_thread, data);
libs_loaded_cnt++;
forb_wait_for_server_ready(orb);