*
*
*/
+#include <semaphore.h>
#include <getopt.h>
#include <forb.h>
#include <forb/config.h>
#include <fres_contract.h>
#include "fcb_config.h"
#include <fosa_clocks_and_timers.h>
+#include "contract_log.h"
#if CONFIG_FCB_INET && !CONFIG_FORB_PROTO_INET_DEFAULT
#include <forb/proto_inet.h>
#endif
UL_LOG_CUST(ulogd_fcb);
-ul_log_domain_t ulogd_fcb = {UL_LOGL_MSG, "fcb"};
-
+ul_log_domain_t ulogd_fcb = {UL_LOGL_MSG, "main"};
+UL_LOGREG_SINGLE_DOMAIN_INIT_FUNCTION(init_ulogd_fcb, ulogd_fcb);
+
+bool opt_daemon = false;
+char *opt_pidfile = NULL;
fosa_abs_time_t start_time;
if (!get_res_key(c, &key)) {
return FRSH_ERR_RESOURCE_ID_INVALID;
}
+ log_contract("Negotiation request", i, c);
} else {
fc = fcb_contract_find(fcb, &c->id);
if (!fc) {
if (fres_contract_get_num_blocks(c) == 0) {
/* Cancelation */
get_res_key(fc->user_contract, &key);
+ log_contract("Cancelation request", i, fc->user_contract);
} else {
/* Renegotiation */
if (!get_res_key(c, &key)) {
return FRSH_ERR_RESOURCE_ID_INVALID;
}
+ log_contract("Renegotiation request", i, fc->user_contract);
}
}
}
if (!*resource) {
ul_logerr("No resource manager for %d.%d registered\n",
key.type, key.id);
- return FRSH_ERR_RESOURCE_ID_INVALID;
+ return FRES_ERR_NO_RESOURCE_MANAGER;
}
}
else if (key.type != key2.type ||
fres_block_spare_capacity *s;
fres_contract_ptr_seq contracts;
- if (!forb_sequence_alloc_buf(contracts, rl->length)) {
+ if (!forb_sequence_alloc_buf(&contracts, rl->length)) {
return errno;
}
contracts._length = rl->length;
NULL;
assert(fc->to_be_reserved_contract != NULL);
- forb_sequence_elem(contracts, i) = fc->to_be_reserved_contract;
+ forb_sequence_elem(&contracts, i) = fc->to_be_reserved_contract;
i++;
s = fres_contract_get_spare_capacity(fc->to_be_reserved_contract);
/* TODO: Simulate continuous granularity by discretization */
if (s && s->granularity == FRSH_GR_DISCRETE) {
fres_container_copy(fc->to_be_reserved_contract->container,
- forb_sequence_elem(s->variants, fc->sc_variant.try));
+ forb_sequence_elem(&s->variants, fc->sc_variant.try));
criterion += fc->sc_variant.try;
if (fcb_changed == NULL) {
fres_contract_destroy(fc->to_be_reserved_contract);
fc->to_be_reserved_contract = NULL;
}
- forb_sequence_free_buf(contracts, forb_no_destructor);
+ forb_sequence_free_buf(&contracts, forb_no_destructor);
return ret;
}
{
struct res_alloc *last_ra = NULL;
fres_contract_ptr_seq vreses;
- int i, ret;
+ int i, ret = 0;
CORBA_Environment ev;
- if (!forb_sequence_alloc_buf(vreses, schedulable_contracts->_length)) {
+ if (!forb_sequence_alloc_buf(&vreses, schedulable_contracts->_length)) {
return errno;
}
vreses._length = 0;
struct fcb_contract *fc;
struct fres_contract *sc = schedulable_contracts->_buffer[i];
+ log_contract("Changing VRES", i, sc);
+
fc = fcb_contract_find(fcb, &sc->id);
assert(fc != NULL);
}
}
- ret = fres_resource_allocator_change_vreses(last_ra->ra,
- &vreses, &ev);
- if (forb_exception_occurred(&ev))
- ret = fres_forbex2err(&ev);
+ if (last_ra) {
+ ret = fres_resource_allocator_change_vreses(last_ra->ra,
+ &vreses, &ev);
+ if (forb_exception_occurred(&ev))
+ ret = fres_forbex2err(&ev);
+ }
err:
- forb_sequence_free_buf(vreses, forb_no_destructor);
+ forb_sequence_free_buf(&vreses, forb_no_destructor);
return ret;
}
/* Allocate all the needed memory before doing reservation. If
* there is no enough memory, it has no sense to call resource
* manager. */
- if (!forb_sequence_alloc_buf(commit_ids, rl.length)) {
+ if (!forb_sequence_alloc_buf(&commit_ids, rl.length)) {
ret = errno;
goto err_free_fcb_contracts;
}
commit_ids._length = rl.length;
i=0;
ul_list_for_each(reservation_list, &rl, fc) {
- forb_sequence_elem(commit_ids, i) = fc->id;
+ forb_sequence_elem(&commit_ids, i) = fc->id;
i++;
}
/* Return IDs and delete canceled contracts from out database */
- if (!forb_sequence_alloc_buf(**ids_out, contracts->_length)) {
+ if (!forb_sequence_alloc_buf(*ids_out, contracts->_length)) {
ev->major = FORB_EX_NO_MEMORY;
goto err_cancel_contracts;
}
(*ids_out)->_length = contracts->_length;
for (i=0; i<contracts->_length; i++) {
struct fcb_contract *fc = fcb_contracts[i];
- forb_sequence_elem(**ids_out, i) = fc->id;
+ forb_sequence_elem(*ids_out, i) = fc->id;
if (fc->requested_contract &&
fres_contract_get_num_blocks(fc->requested_contract) == 0) {
struct res_key resource;
forb_server_id server_id;
char server_id_str[40];
+ int ret;
forb_get_server_id(ra_obj, &server_id);
forb_server_id_to_string(server_id_str, &server_id, sizeof(server_id_str));
if (!res) {
ul_logerr("No manager found for %d.%d. Unable to register the allocator!\n",
restype, resid);
+ ret = FRES_ERR_NO_RESOURCE_MANAGER;
goto err;
}
ra = fcb_alloc_find(res, &server_id);
ul_logerr("Allocator from already registered (%s)\n",
str);
forb_free(str);
+ ret = FRES_ERR_ALLOCATOR_ALREADY_REGISTERED;
goto err;
}
ra = malloc(sizeof(*ra));
if (!ra) {
+ ret = ENOMEM;
goto err;
}
ra->app = server_id;
fcb_alloc_insert(res, ra);
return 0;
err:
- return FRSH_ERR_RESOURCE_ID_INVALID;
+ return ret;
}
void get_resources(fres_contract_broker obj, fres_resource_seq** resources, CORBA_Environment *ev)
}
static struct option long_opts[] = {
- { "loglevel", 1, 0, 'l' },
+ { "daemon", optional_argument, NULL, 'd' },
+ { "loglevel", required_argument, NULL, 'l' },
{ 0, 0, 0, 0}
};
usage(void)
{
printf("usage: fcb [ options ]\n");
+ printf(" -d, --daemon [pid-file] go to background after FORB initialization\n");
printf(" -l, --loglevel <number>|<domain>=<number>,...\n");
}
+int print_log_domain(ul_log_domain_t *domain, void *context)
+{
+ printf("%s = %d\n", domain->name, domain->level);
+ return 0;
+}
+
int main(int argc, char *argv[])
{
forb_orb orb;
.fixed_tcp_port = FCB_TCP_PORT,
#ifdef CONFIG_FORB_PROTO_INET_DEFAULT
.fixed_server_id = FCB_SERVER_ID,
+ .redistribute_hellos = true,
#endif
};
int opt;
- ul_logreg_domain(&ulogd_fcb);
-
- while ((opt = getopt_long(argc, argv, "l:", &long_opts[0], NULL)) != EOF) {
+ while ((opt = getopt_long(argc, argv, "d::l:", &long_opts[0], NULL)) != EOF) {
switch (opt) {
case 'l':
- ul_log_domain_arg2levels(optarg);
+ if (*optarg == '?') {
+ ul_logreg_for_each_domain(print_log_domain, NULL);
+ exit(0);
+ }
+ {
+ int ret;
+ ret = ul_log_domain_arg2levels(optarg);
+ if (ret)
+ error(1, EINVAL, "Error parsing -l argument at char %d\n", ret);
+ }
+ break;
+ case 'd':
+ opt_daemon = true;
+ opt_pidfile = optarg;
break;
case 'h':
/*default:*/
fosa_clock_get_time(CLOCK_REALTIME, &start_time);
+ if (opt_daemon)
+ forb_daemon_prepare(opt_pidfile);
+
orb = forb_init(&argc, &argv, &attr);
if (!orb) error(1, errno, "FORB initialization failed");
if (ret) error(1, errno, "forb_register_reference() failed");
ul_logmsg("Waiting for requests\n");
+ if (opt_daemon)
+ forb_daemon_ready();
+
ret = forb_executor_run(&executor);
if (ret) error(1, errno, "forb_executor_run failed");
projects / frescor / frsh.git / blobdiff