]> rtime.felk.cvut.cz Git - frescor/frsh.git/blobdiff - fres/cbroker/fcb.c
Progress on transaction negotiation
[frescor/frsh.git] / fres / cbroker / fcb.c
index d18d072d4224708070462608450fcd8352d22519..7fc217aa4bc07e867713931634c803876804f851 100644 (file)
  * 
  * 
  */
+#define WITH_C99               /* For ul_gsa.h iterators */
+#include <semaphore.h>
+#include <getopt.h>
 #include <forb.h>
+#include <forb/config.h>
 #include <fcb.h>
+#include <fcb_contact_info.h>
 #include <error.h>
 #include <errno.h>
 #include <stdio.h>
 #include <ul_gavlcust.h>
+#include <ul_gsacust.h>
 #include <string.h>
 #include <ul_log.h>
+#include <ul_logreg.h>
 #include <forb/server_id.h>
 #include <fres_contract.h>
 #include "fcb_config.h"
 #include <fosa_clocks_and_timers.h>
-#ifdef CONFIG_FCB_INET
+#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"};
+#define COMPILE_TIME_ASSERT(cond, msg) \
+       typedef char msg[(cond) ? 1 : -1]
+
 
+UL_LOG_CUST(ulogd_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;
 
+/** List of contracts to be newly reserved or changed by resource manager */
+struct reservation_list {
+       ul_list_head_t fcb_contracts;
+       unsigned length;
+};
 
 /**
  * Resource identification 
@@ -89,9 +109,11 @@ struct res_key {
 struct resource {
        gavl_node_t node;
        struct res_key key;
+       char *name;
        fres_resource_manager mng; /**< Object reference of the resource manager */
        gavl_cust_root_field_t allocators; /**< Registered allocators for this resource (from multiple applications/nodes) */
        ul_list_head_t sc_contracts; /**< Negotiated contracts with spare capacity for this resource */
+       struct reservation_list rl; /**< Temporary list of contracts to be reserved on this resource */
 };
 
 /**
@@ -124,16 +146,11 @@ struct fcb_contract {
  * Contract broker data
  */
 struct fcb {
+       fres_contract_id_t contract_counter;
        gavl_cust_root_field_t resources; /**< Registered resources */
        gavl_cust_root_field_t contracts; /**< Contracts negotiated by this FCB */
 };
 
-/** List of contracts to be reserved during spare capacity rebalancing */
-struct reservation_list {
-       ul_list_head_t fcb_contracts;
-       unsigned length;
-};
-
 struct fcb_contract *fcb_contract_new(fres_contract_id_t *id)
 {
        struct fcb_contract *fcb_contract;
@@ -255,10 +272,32 @@ GAVL_CUST_NODE_INT_IMP(fcb_contract         /* cust_prefix */,            \
 #include "fcb_contract_gavl.inc"
 #endif
 
+struct res_array {
+       gsa_array_field_t array;
+};
+
+GSA_CUST_DEC(res_array         /* cust_prefix */,
+            struct res_array   /* cust_array_t */,
+            struct resource    /* cust_item_t */,
+            struct res_key     /* cust_key_t */,
+            array              /* cust_array_field */,
+            key                /* cust_item_key */,
+            res_key_cmp        /* cust_cmp_fnc */);
+
+GSA_CUST_IMP(res_array         /* cust_prefix */,
+            struct res_array   /* cust_array_t */,
+            struct resource    /* cust_item_t */,
+            struct res_key     /* cust_key_t */,
+            array              /* cust_array_field */,
+            key                /* cust_item_key */,
+            res_key_cmp        /* cust_cmp_fnc */,
+            true               /* cust_ins_fl */);
+
+
 
 #define o2fcb(o) (struct fcb*)forb_instance_data(o)
 
-struct res_key*
+static struct res_key*
 get_res_key(const struct fres_contract *contract, struct res_key *key)
 {
        fres_block_resource *block_res;
@@ -274,44 +313,49 @@ get_res_key(const struct fres_contract *contract, struct res_key *key)
        return key;
 }
 
+static struct res_key*
+get_fc_res_key(const struct fcb_contract *fc, struct res_key *key)
+{
+       if (fc->user_contract)
+               get_res_key(fc->user_contract, key);
+       else
+               get_res_key(fc->requested_contract, key);
+       return key;
+}
+
 /** 
  * Fills in an array of fcb_contracts according to requests submited
- * to negotiate_contracts(). For every contract in @a contracts, there
- * is one fcb_contract in @a fcb_contracts array.
+ * by an application through negotiate_contracts() or
+ * negotiate_transaction(). For every contract in @a contracts, there
+ * is allocated one fcb_contract in @a fcb_contracts array.
  * 
  * @param fcb
  * @param fcb_contracts Where to store pointers to fcb_contracts
- * @param resource Resource for which negotiation is being done.
- * @param app Application which requests negotiation
- * @param contracts Contracts submited to negotiate_contracts() 
+ * @param contracts Contracts submited for negotiation 
  * @param num Number of contracts in contracts (which is the same as the number in fcb_contracts).
  * 
  * @return Zero on success, non-zero error code on error.
  */
 static int
 prepare_fcb_contracts(struct fcb *fcb, struct fcb_contract *fcb_contracts[],
-                     struct resource **resource,
-                     forb_server_id *app,
                      struct fres_contract *contracts[], int num)
 {
        unsigned i;
        struct fcb_contract *fc;
-       struct res_alloc *ra;
-       struct res_key key, key2 = {-1,-1};
 
        for (i=0; i<num; i++) {
                struct fres_contract *c = contracts[i];
 
                if (fres_contract_id_is_empty(&c->id)) {
                        /* Normal negotiation request */
-                       forb_uuid_generate((forb_uuid_t *)&c->id);
+                       COMPILE_TIME_ASSERT(sizeof(c->id) == sizeof(fcb->contract_counter),
+                                           wrong_size_of_contract_id);
+                       c->id = ++fcb->contract_counter;
                        fc = fcb_contract_new(&c->id);
                        if (!fc)
                                return errno;
                        fcb_contracts[i] = fc;
-                       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) {
@@ -323,16 +367,43 @@ prepare_fcb_contracts(struct fcb *fcb, struct fcb_contract *fcb_contracts[],
                                fcb_contracts[i] = 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);
                                }
                        }
                }
                fc->requested_contract = c;
+       }
+       return 0;
+}
+
+/**
+ * Ensure that all contracts belong to the same resource and find
+ * resource allocators for the contracts.
+ *
+ * @param fcb 
+ * @param fcb_contracts Array of fcb_contracts prepared by prepare_fcb_contracts()
+ * @param num Number of contracts in @a fcb_contracts
+ * @param resource Resource for which negotiation is being done.
+ * @param app Application which requests negotiation
+ */
+static int
+check_and_setup_resource(struct fcb *fcb, struct fcb_contract *fcb_contracts[],
+                        struct resource **resource,
+                        forb_server_id *app,
+                        int num)
+{
+       unsigned i;
+       struct res_alloc *ra;
+       struct res_key key, key2 = {-1,-1};
+
+       for (i=0; i<num; i++) {
+               struct fcb_contract *fc = fcb_contracts[i];
+
+               if (!get_fc_res_key(fc, &key))
+                       return FRSH_ERR_RESOURCE_ID_INVALID;
 
                /* Check that all contracts are for the same resource */
                if (i==0) {
@@ -341,7 +412,16 @@ prepare_fcb_contracts(struct fcb *fcb, struct fcb_contract *fcb_contracts[],
                        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;
+                       }
+                       /* Find allocator for this request */
+                       ra = fcb_alloc_find(*resource, app);
+                       if (!ra) {
+                               char str[60];
+                               forb_server_id_to_string(str, app, sizeof(str));
+                               ul_logerr("No resource allocator found for %d.%d and %s\n",
+                                         (*resource)->key.type, (*resource)->key.id, str);
+                               return FRES_ERR_NO_RESOURCE_ALLOCATOR;
                        }
                }
                else if (key.type != key2.type ||
@@ -349,27 +429,16 @@ prepare_fcb_contracts(struct fcb *fcb, struct fcb_contract *fcb_contracts[],
                        ul_logerr("Contract #%d differs in resource!\n", i);
                        return FRSH_ERR_RESOURCE_ID_INVALID;
                }
-
-               /* Find allocator for this request */
-               ra = fcb_alloc_find(*resource, app);
-               if (!ra) {
-                       char str[60];
-                       forb_server_id_to_string(str, app, sizeof(str));
-                       ul_logerr("No resource allocator found for %d.%d and %s\n",
-                                 (*resource)->key.type, (*resource)->key.id, str);
-                       return FRES_ERR_NO_RESOURCE_ALLOCATOR;
-               }
                fc->ra = ra;
        }       
        return 0;
 }
 
-static void fres_contract_ptr_destroy(struct fres_contract **p)
-{
-       fres_contract_destroy(*p);
-}
-
 /**
+ * Prepares a list of contracts to pass to resource manager for (re)reserving.
+ *
+ * @todo Needs to be changed for compatibility with transactions.
+ * 
  * @param resource Resource for which to rebalance capacity and negotiate new contracts
  * @param fcb_contract New requests to negotiate
  * @param num The number of elements in @a fcb_contract
@@ -377,31 +446,81 @@ static void fres_contract_ptr_destroy(struct fres_contract **p)
  */
 static void
 prepare_reservation_list(struct resource *resource,
-                        struct fcb_contract *fcb_contract[], int num,
-                        struct reservation_list *rl)
+                        struct fcb_contract *fcb_contract[], int num)
 {
        int i;
        fosa_abs_time_t now;
        struct fcb_contract *fc;
 
-       reservation_list_init_head(rl);
-       rl->length = 0;
+       reservation_list_init_head(&resource->rl);
+       resource->rl.length = 0;
        for (i=0; i<num; i++) {
                assert(fcb_contract[i]->requested_contract != NULL);
-               reservation_list_insert(rl, fcb_contract[i]);
-               rl->length++;
+               reservation_list_insert(&resource->rl, fcb_contract[i]);
+               resource->rl.length++;
        }
        fosa_clock_get_time(CLOCK_REALTIME, &now);
        ul_list_for_each(sc_contracts, resource, fc) {
                if (fosa_abs_time_smaller(fc->end_of_stability_period, now) &&
                    fc->requested_contract == NULL) /* Do not insert contract inserted above */
                {
-                       reservation_list_insert(rl, fc);
-                       rl->length++;
+                       reservation_list_insert(&resource->rl, fc);
+                       resource->rl.length++;
                }
        }
 }
 
+static int
+reserve_resource(struct resource *resource)
+{
+       int ret, i;
+       fres_contract_ptr_seq contracts;
+       struct fres_contract *c;
+       struct fcb_contract *fc;
+       CORBA_Environment ev;
+       
+       if (!forb_sequence_alloc_buf(&contracts, resource->rl.length)) {
+               ret = errno;
+               goto err;
+       }
+       forb_sequence_length(&contracts) = resource->rl.length;
+
+       i=0;
+       /* Prepare FORB sequence  */
+       ul_list_for_each(reservation_list, &resource->rl, fc) {
+               c = NULL;
+               if (fc->to_be_reserved_contract)
+                       /* Contract without spare capacity */
+                       c = fc->to_be_reserved_contract;
+               else if (fc->requested_contract)
+                       c = fc->requested_contract;
+               assert(c);
+               forb_sequence_elem(&contracts, i++) = c;
+       }
+       
+       /* Reserve contract */
+       ret = fres_resource_manager_reserve_contracts(resource->mng, &contracts, &ev);
+       if (forb_exception_occurred(&ev)) {
+               ret = fres_forbex2err(&ev);
+               ul_logerr("FORB exception when reserving contracts\n");
+               goto err_free;
+       }
+       if (ret < 0) {
+               ul_logerr("Contract reservation error %d\n", ret);
+               ret = FRES_ERR_ADMISSION_TEST;
+               goto err_free;
+       } else if (ret == 0)
+               ret = FRSH_NO_ERROR;
+       else if (ret == 1)
+               ret = FRSH_ERR_CONTRACT_REJECTED;
+       else
+               assert(false);
+err_free:
+       forb_sequence_free_buf(&contracts, forb_no_destructor);
+err:
+       return ret;
+}
+
 /** 
  * 
  * 
@@ -411,18 +530,13 @@ prepare_reservation_list(struct resource *resource,
  * @return Zero on success, non-zero error code on error
  */
 static int
-rebalance_spare_capacity_and_reserve(struct resource *resource,
-                                    struct reservation_list *rl)
+rebalance_spare_capacity_and_reserve(struct resource *resource)
 {
        int ret;
-       unsigned i;
+       struct reservation_list *rl = &resource->rl;
        struct fcb_contract *fc;
        fres_block_spare_capacity *s;
 
-       fres_contract_ptr_seq contracts;
-       forb_sequence_alloc_buf(contracts, rl->length);
-       contracts._length = rl->length;
-       i=0;
        /* Initialize optimization */
        ul_list_for_each(reservation_list, rl, fc) {
                fc->to_be_reserved_contract =
@@ -431,9 +545,6 @@ rebalance_spare_capacity_and_reserve(struct resource *resource,
                        NULL;
                assert(fc->to_be_reserved_contract != NULL);
 
-               forb_sequence_elem(contracts, i) = fc->to_be_reserved_contract;
-               i++;
-               
                s = fres_contract_get_spare_capacity(fc->to_be_reserved_contract);
                if (s && s->granularity == FRSH_GR_DISCRETE) {
                        fc->sc_variant.initial = s->variants._length - 1;
@@ -456,7 +567,7 @@ rebalance_spare_capacity_and_reserve(struct resource *resource,
                        /* 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) {
@@ -477,21 +588,15 @@ rebalance_spare_capacity_and_reserve(struct resource *resource,
                }
 
                if (criterion > best_criterion) {
-                       CORBA_Environment ev;
-                       /* Reserve contract */
-                       ret = fres_resource_manager_reserve_contracts(resource->mng, &contracts, &ev);
-                       if (forb_exception_occurred(&ev)) {
-                               ret = FRES_ERR_FORB_EXCEPTION;
-                               ul_logerr("FORB exception when reserving contracts\n");
-                               goto err;
-                       }
-                       if (ret < 0) {
-                               ul_logerr("Contract reservation error %d\n", ret);
-                               ret = FRES_ERR_ADMISSION_TEST;
-                               goto err;
-                       }
-                       if (ret == 0) { /* negotiation succeeded */
+                       ret = reserve_resource(resource);
+                       switch (ret) {
+                       case FRSH_NO_ERROR:
                                best_criterion = criterion;
+                               break;
+                       case FRSH_ERR_CONTRACT_REJECTED:
+                               break;
+                       default:
+                               goto err;
                        }
                }
        } while (!all_combinations_tried);
@@ -514,7 +619,6 @@ err:
                fres_contract_destroy(fc->to_be_reserved_contract);
                fc->to_be_reserved_contract = NULL;
        }
-       forb_sequence_free_buf(contracts, forb_no_destructor);
        return ret;
 }
 
@@ -532,16 +636,20 @@ change_vreses(struct fcb *fcb, fres_contract_ptr_seq *schedulable_contracts)
 {
        struct res_alloc *last_ra = NULL;
        fres_contract_ptr_seq vreses;
-       int i, ret;
+       int i, ret = 0;
        CORBA_Environment ev;
        
-       forb_sequence_alloc_buf(vreses, schedulable_contracts->_length);
+       if (!forb_sequence_alloc_buf(&vreses, schedulable_contracts->_length)) {
+               return errno;
+       }
        vreses._length = 0;
        
        for (i=0; i<schedulable_contracts->_length; i++) {
                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);
 
@@ -551,7 +659,7 @@ change_vreses(struct fcb *fcb, fres_contract_ptr_seq *schedulable_contracts)
                                        ret = fres_resource_allocator_change_vreses(last_ra->ra,
                                                                                    &vreses, &ev);
                                        if (forb_exception_occurred(&ev)) {
-                                               ret = FRES_ERR_FORB_EXCEPTION;
+                                               ret = fres_forbex2err(&ev);
                                                goto err;
                                        }
                                        if (ret) goto err;
@@ -566,15 +674,100 @@ change_vreses(struct fcb *fcb, fres_contract_ptr_seq *schedulable_contracts)
                
                }
        }
-       ret = fres_resource_allocator_change_vreses(last_ra->ra,
-                                                   &vreses, &ev);
-       if (forb_exception_occurred(&ev))
-               ret = FRES_ERR_FORB_EXCEPTION;
+       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;
 }
 
+void
+free_fcb_contracts(struct fcb_contract *fcb_contracts[], int num)
+{
+       int i;
+       struct fcb_contract *fc;
+       for (i=0; i<num; i++) {
+               fc = fcb_contracts[i];
+               if (fc && !fc->user_contract) {
+                       fc->requested_contract = NULL; /* Destroyed by FORB */
+                       fcb_contract_destroy(fc);
+               }
+       }
+       free(fcb_contracts);
+}
+
+int
+commit_resource(struct resource *resource,
+               fres_contract_ptr_seq **schedulable_contracts)
+{
+       int ret;
+       fres_contract_id_seq commit_ids;
+       int i;
+       struct fcb_contract *fc;
+       CORBA_Environment ev;
+       
+       if (!forb_sequence_alloc_buf(&commit_ids, resource->rl.length)) {
+               ret = errno;
+               goto err;
+       }
+
+       commit_ids._length = resource->rl.length;
+       i=0;
+       ul_list_for_each(reservation_list, &resource->rl, fc) {
+               forb_sequence_elem(&commit_ids, i) = fc->id;
+               i++;
+       }
+       
+       fres_resource_manager_commit_contracts(resource->mng, &commit_ids,
+                                              schedulable_contracts, &ev);
+       if (forb_exception_occurred(&ev)) {
+               ret = fres_forbex2err(&ev);
+               goto err_free;
+       }
+       return 0;
+err_free:
+       forb_sequence_free_buf(&commit_ids, forb_no_destructor);
+err:
+       return ret;
+}
+
+int cancel_reservations(struct resource *resource)
+{
+       int ret;
+       fres_contract_id_seq commit_ids;
+       int i;
+       struct fcb_contract *fc;
+       CORBA_Environment ev;
+       
+       if (!forb_sequence_alloc_buf(&commit_ids, resource->rl.length)) {
+               ret = errno;
+               goto err;
+       }
+
+       commit_ids._length = resource->rl.length;
+       i=0;
+       ul_list_for_each(reservation_list, &resource->rl, fc) {
+               forb_sequence_elem(&commit_ids, i) = fc->id;
+               i++;
+       }
+       
+       fres_resource_manager_cancel_reservations(resource->mng, &commit_ids, &ev);
+       if (forb_exception_occurred(&ev)) {
+               ret = fres_forbex2err(&ev);
+               goto err_free;
+       }
+       return 0;
+err_free:
+       forb_sequence_free_buf(&commit_ids, forb_no_destructor);
+err:
+       return ret;
+}
+
+
 CORBA_long
 negotiate_contracts(fres_contract_broker obj,
                    const fres_contract_ptr_seq* contracts,
@@ -582,13 +775,13 @@ negotiate_contracts(fres_contract_broker obj,
                    CORBA_Environment *ev)
 {
        struct fcb *fcb = o2fcb(obj);
-       struct resource *resource;
-       int ret;
+       struct resource *resource = NULL;
+       int ret = 0;
        forb_server_id app;
        fres_contract_ptr_seq *schedulable_contracts;
        struct fcb_contract **fcb_contracts, *fc;
        unsigned i;
-       fres_contract_id_seq commit_ids;
+       int num = contracts->_length;
 
        /* Prepare output sequence for the case we return eariler with
         * an error */
@@ -601,34 +794,26 @@ negotiate_contracts(fres_contract_broker obj,
        
        forb_get_req_source(obj, &app);
        
-       fcb_contracts = malloc(sizeof(fcb_contracts[0])*contracts->_length);
+       fcb_contracts = malloc(sizeof(fcb_contracts[0])*num);
        if (!fcb_contracts) {
                ret = errno;
                goto err;
        }
-       memset(fcb_contracts, 0, sizeof(fcb_contracts[0])*contracts->_length);
+       memset(fcb_contracts, 0, sizeof(fcb_contracts[0])*num);
 
-       ret = prepare_fcb_contracts(fcb, fcb_contracts, &resource,
-                                   &app, contracts->_buffer, contracts->_length);
+       ret = prepare_fcb_contracts(fcb, fcb_contracts,
+                                   contracts->_buffer, num);
        if (ret)
                goto err_free_fcb_contracts;
-
-       struct reservation_list rl;
-       prepare_reservation_list(resource,
-                                fcb_contracts, contracts->_length,
-                                &rl);
-
-       /* Allocate all the needed memory before doing reservation. If
-        * there is no enough memory, it has no sense to call resource
-        * manager. */
-       forb_sequence_alloc_buf(commit_ids, rl.length);
-       if (!commit_ids._buffer) {
-               ret = errno;
+       ret = check_and_setup_resource(fcb, fcb_contracts, &resource,
+                                      &app, num);
+       if (ret)
                goto err_free_fcb_contracts;
-       }
+
+       prepare_reservation_list(resource, fcb_contracts, num);
 
        /* Reserve contracts */
-       ret = rebalance_spare_capacity_and_reserve(resource, &rl);
+       ret = rebalance_spare_capacity_and_reserve(resource);
        if (ret) {
                if (ret == FRSH_ERR_CONTRACT_REJECTED) {
                        ul_logmsg("Contract(s) was/were rejected\n");
@@ -641,23 +826,13 @@ negotiate_contracts(fres_contract_broker obj,
        }
 
        /* Commit contracts */
-       commit_ids._length = rl.length;
-       i=0;
-       ul_list_for_each(reservation_list, &rl, fc) {
-               forb_sequence_elem(commit_ids, i) = fc->id;
-               i++;
-       }
-       
-       fres_resource_manager_commit_contracts(resource->mng, &commit_ids,
-                                              &schedulable_contracts, ev);
-       if (forb_exception_occurred(ev)) {
-               ret = FRES_ERR_FORB_EXCEPTION;
+       ret = commit_resource(resource, &schedulable_contracts);
+       if (ret)
                goto err_cancel_reservation;
-       }
 
        /* Add new contracts to our fcb database for later
         * reference. Canceled contracts are removed below. */
-       for (i=0; i<contracts->_length; i++) {
+       for (i=0; i<num; i++) {
                fc =  fcb_contracts[i];
 
                if (fc->user_contract) {
@@ -691,15 +866,14 @@ negotiate_contracts(fres_contract_broker obj,
 
 
        /* Return IDs and delete canceled contracts from out database */
-       forb_sequence_alloc_buf(**ids_out, contracts->_length);
-       if (!(*ids_out)->_buffer) {
+       if (!forb_sequence_alloc_buf(*ids_out, num)) {
                ev->major = FORB_EX_NO_MEMORY;
                goto err_cancel_contracts;
        }
-       (*ids_out)->_length = contracts->_length;
-       for (i=0; i<contracts->_length; i++) {
+       (*ids_out)->_length = num;
+       for (i=0; i<num; 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) {
@@ -716,16 +890,9 @@ err_cancel_contracts:
        /* TODO */
        goto err_free_fcb_contracts;
 err_cancel_reservation:
-       fres_resource_manager_cancel_reservations(resource->mng, &commit_ids, ev);
+       cancel_reservations(resource);
 err_free_fcb_contracts:
-       for (i=0; i<contracts->_length; i++) {
-               fc = fcb_contracts[i];
-               if (fc && !fc->user_contract) {
-                       fcb_contracts[i]->requested_contract = NULL; /* Destroyed by FORB */
-                       fcb_contract_destroy(fcb_contracts[i]);
-               }
-       }
-       free(fcb_contracts);
+       free_fcb_contracts(fcb_contracts, num);
 err:
        return ret;
 }
@@ -738,11 +905,10 @@ void redistribute_spare_capacity(fres_contract_broker obj,
        struct fcb *fcb = o2fcb(obj);
        struct res_key key = {restype, resid };
        struct resource *resource;
-       struct reservation_list rl;
        
        resource = fcb_resource_find(fcb, &key);
 
-       prepare_reservation_list(resource, NULL, 0, &rl);
+       prepare_reservation_list(resource, NULL, 0);
 
 /*     forb_sequence_alloc(ids, rl.length); */
 /*     if (!ids || !ids->_buffer) { */
@@ -753,7 +919,7 @@ void redistribute_spare_capacity(fres_contract_broker obj,
 /*     *ids_out = ids;         /\* ids is freed by FORB *\/ */
        
        
-       rebalance_spare_capacity_and_reserve(resource, &rl);
+       rebalance_spare_capacity_and_reserve(resource);
        /* Commit */
 }
 
@@ -789,11 +955,12 @@ CORBA_long register_resource(fres_contract_broker obj,
                }
        }
        res->mng = forb_object_duplicate(desc->manager);
+       res->name = desc->name;
 
        fcb_alloc_init_root_field(res);
        sc_contracts_init_head(res);
-       ul_logmsg("Registering manager for resource %d.%d\n",
-                 restype, resid);
+       ul_logmsg("Registering manager for resource \"%s\" (%d.%d)\n",
+                 res->name, restype, resid);
        fcb_resource_insert(fcb, res);
        return 0;
 free_err:
@@ -815,6 +982,7 @@ CORBA_long register_allocator(fres_contract_broker obj,
        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));
@@ -827,6 +995,7 @@ CORBA_long register_allocator(fres_contract_broker obj,
        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);
@@ -835,10 +1004,12 @@ CORBA_long register_allocator(fres_contract_broker obj,
                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;
@@ -846,7 +1017,7 @@ CORBA_long register_allocator(fres_contract_broker obj,
        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)
@@ -877,13 +1048,141 @@ void get_resources(fres_contract_broker obj, fres_resource_seq** resources, CORB
                seq->_buffer[n].restype = res->key.type;
                seq->_buffer[n].resid = res->key.id;
                seq->_buffer[n].desc.manager = res->mng;
+               seq->_buffer[n].desc.name = res->name;
                n++;
        }
 
        *resources = seq;
 }
 
-#ifdef CONFIG_FCB_INET
+static bool
+transaction_has_spare_capacity(const fres_transaction_t* transaction)
+{
+       struct fres_contract **c;
+       forb_sequence_foreach(&transaction->contracts, c)
+               if (fres_contract_get_spare_capacity(*c))
+                       return true;
+       return false;
+}
+
+static int
+transaction_get_resources(struct fcb *fcb, struct fcb_contract *fc[],
+                         int num, struct res_array *res_array)
+{
+       int i;
+       struct resource *resource;
+       struct res_key key;
+       int ret;
+
+       res_array_init_array_field(res_array);
+       for (i = 0; i < num; i++) {
+               get_fc_res_key(fc[i], &key);
+               resource = fcb_resource_find(fcb, &key);
+               ret = res_array_insert(res_array, resource);
+               if (ret == -1) {
+                       ret = FRSH_ERR_INTERNAL_ERROR;
+                       goto err;
+               }
+       }
+       ret = 0;
+err:
+       return ret;
+}
+                                
+CORBA_long
+negotiate_transaction(fres_contract_broker _obj,
+                     const fres_transaction_t* transaction,
+                     CORBA_Environment *ev)
+{
+       struct fcb *fcb = o2fcb(_obj);
+       struct fcb_contract **fcb_contracts, *fc;
+       const fres_contract_ptr_seq* user_contracts = &transaction->contracts;
+       int i, ret, num = user_contracts->_length;
+       struct res_array res_array;
+       struct res_key key;
+       struct resource *resource;
+
+       ul_logmsg("Negotiating transaction of %d contracts\n", num);
+       if (transaction_has_spare_capacity(transaction)) {
+               ret =  FRES_ERR_SPARE_CAPACITY_NOT_SUPPORTED;
+               goto err;
+       }
+
+       fcb_contracts = malloc(sizeof(*fcb_contracts)*num);
+       if (!fcb_contracts) {
+               ret = errno;
+               goto err;
+       }
+       memset(fcb_contracts, 0, sizeof(*fcb_contracts)*num);
+
+       ret = prepare_fcb_contracts(fcb, fcb_contracts,
+                                   user_contracts->_buffer, num);
+       if (ret)
+               goto err_free_fcb_contracts;
+
+       ret = transaction_get_resources(fcb, fcb_contracts, num, &res_array);
+
+       gsa_cust_for_each(res_array, &res_array, resource) {
+               reservation_list_init_head(&resource->rl);
+               resource->rl.length = 0;
+               for (i = 0; i < num; i++) {
+                       fc = fcb_contracts[i];
+                       get_fc_res_key(fc, &key);
+                       if (res_key_cmp(&key, &resource->key) == 0) {
+                               reservation_list_insert(&resource->rl, fc);
+                               resource->rl.length++;
+                       }
+               }
+       }
+       gsa_cust_for_each(res_array, &res_array, resource) {
+               ret = reserve_resource(resource);
+               if (ret) {
+                       ul_logerr("Reservation failed\n");
+                       goto err_cancel_reservation;
+               }
+       }
+       gsa_cust_for_each(res_array, &res_array, resource) {
+               ret = commit_resource(resource);
+               if (ret) {
+                       ul_logerr("Commit failed\n");
+                       goto err_cancel_reservation;
+               }
+       }
+       
+       return 0;
+err_cancel_reservation:
+       gsa_cust_for_each(res_array, &res_array, resource) {
+               cancel_reservations(resource);
+       }
+err_free_res_contracts:
+       forb_sequence_free_buf(&res_contracts, forb_no_destructor);
+err_free_resources:
+       res_array_delete_all(&res_array);
+err_free_fcb_contracts:
+       free_fcb_contracts(fcb_contracts, num);
+err:
+       return ret;
+}
+
+CORBA_long
+wait_transaction(fres_contract_broker _obj,
+                const CORBA_char * name,
+                fres_transaction_t** transaction,
+                CORBA_Environment *ev)
+{
+       return FRSH_ERR_NOT_IMPLEMENTED;
+}
+
+CORBA_long
+allocate_transaction_vres(fres_contract_broker _obj,
+                         const CORBA_long id,
+                         CORBA_Environment *ev)
+{
+       return FRSH_ERR_NOT_IMPLEMENTED;
+}
+
+
+#if CONFIG_FCB_INET && !CONFIG_FORB_PROTO_INET_DEFAULT
 static int register_inet_port(forb_orb orb)
 {
        forb_port_t *port = forb_malloc(sizeof(*port));
@@ -894,7 +1193,7 @@ static int register_inet_port(forb_orb orb)
                return -1;
        memset(port, 0, sizeof(*port));
        listen_on.s_addr = INADDR_ANY;
-       ret = forb_inet_port_init(&port->desc, listen_on);
+       ret = forb_inet_port_init(&port->desc, listen_on, 0);
        if (ret)
                return ret;
        ret = forb_register_port(orb, port);
@@ -908,6 +1207,9 @@ struct forb_fres_contract_broker_impl impl = {
        .register_allocator = register_allocator,
        .redistribute_spare_capacity = redistribute_spare_capacity,
        .get_resources = get_resources,
+       .negotiate_transaction = negotiate_transaction,
+       .wait_transaction = wait_transaction,
+       .allocate_transaction_vres = allocate_transaction_vres,
 };
 
 void peer_discovery_callback(const forb_orb peer_orb, const char *orb_id)
@@ -938,6 +1240,26 @@ void peer_dead_callback(const forb_orb peer_orb, const char *orb_id)
 {
 }
 
+static struct option long_opts[] = {
+    { "daemon",   optional_argument, NULL, 'd' },
+    { "loglevel", required_argument, NULL, 'l' },
+    { 0, 0, 0, 0}
+};
+
+static void
+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;
@@ -949,15 +1271,49 @@ int main(int argc, char *argv[])
                .orb_id = "org.frescor.fcb",
                .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, "d::l:", &long_opts[0], NULL)) != EOF) {
+               switch (opt) {
+                       case 'l':
+                               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:*/
+                               usage();
+                               exit(opt == 'h' ? 0 : 1);
+               }
+       }
 
-
+       memset(&fcb_data, 0, sizeof(fcb_data));
        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");
 
-#ifdef CONFIG_FCB_INET
+#if CONFIG_FCB_INET && !CONFIG_FORB_PROTO_INET_DEFAULT
        ret = register_inet_port(orb);
        if (ret) error(0, errno, "INET port registration failed");
 #endif
@@ -980,6 +1336,9 @@ int main(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();
+
        ret = forb_executor_run(&executor);
        if (ret) error(1, errno, "forb_executor_run failed");