* reference. Canceled contracts are removed below. */
int
fcb_remember_contracts(struct fcb *fcb,
- struct fcb_contract **fcb_contracts, int num,
- fres_contract_ptr_seq *schedulable_contracts)
+ struct fcb_contract **fcb_contracts, int num)
{
struct fcb_contract *fc;
int i;
/* See the note above. */
}
}
+ return 0;
+}
+
+int
+fcb_remember_schedulable_contracts(struct fcb *fcb,
+ fres_contract_ptr_seq *schedulable_contracts)
+{
+ struct fcb_contract *fc;
+ int i;
for (i=0; i<schedulable_contracts->_length; i++) {
struct fres_contract *sc = schedulable_contracts->_buffer[i];
fc = fcb_contract_find(fcb, &sc->id);
assert(fc != NULL);
fres_contract_destroy(fc->schedulable_contract);
fc->schedulable_contract = fres_contract_duplicate(sc);
+ assert(fc->schedulable_contract);
}
-
return 0;
}
+
CORBA_long
negotiate_contracts(fres_contract_broker obj,
const fres_contract_ptr_seq* contracts,
if (ret)
goto err_cancel_reservation;
- fcb_remember_contracts(fcb, fcb_contracts, num,
- schedulable_contracts);
+ fcb_remember_contracts(fcb, fcb_contracts, num);
+ fcb_remember_schedulable_contracts(fcb, schedulable_contracts);
ret = change_vreses(fcb, schedulable_contracts);
if (ret)
fres_contract_ptr_seq *schedulable_contracts;
struct fcb_transaction *ft;
- ul_logmsg("Negotiating transaction with %d contracts\n", num);
+ ul_logmsg("Negotiating transaction '%s' with %d contracts\n", transaction->name, num);
if (transaction_has_spare_capacity(transaction)) {
ret = FRES_ERR_SPARE_CAPACITY_NOT_SUPPORTED;
goto err;
goto err_cancel_reservation;
}
}
+ fcb_remember_contracts(fcb, fcb_contracts, num);
gsa_cust_for_each(res_array, &res_array, resource) {
ret = commit_resource(resource, &schedulable_contracts);
if (ret) {
ul_logerr("Commit failed\n");
goto err_cancel_reservation;
}
+ fcb_remember_schedulable_contracts(fcb, schedulable_contracts);
+ forb_sequence_free(schedulable_contracts, fres_contract_ptr_destroy);
}
- fcb_remember_contracts(fcb, fcb_contracts, num,
- schedulable_contracts);
- forb_sequence_free(schedulable_contracts, fres_contract_ptr_destroy);
ft = fcb_transaction_new(transaction->name);
if (!ft) {
CORBA_long
allocate_transaction_vres(fres_contract_broker _obj,
const CORBA_char * name,
- const CORBA_long id,
+ const CORBA_long index,
+ fres_contract_id_t *id,
CORBA_Environment *ev)
{
struct fcb *fcb = o2fcb(_obj);
struct fcb_transaction *ft;
+ struct fcb_contract *fc;
int ret;
- char * const n = (char * const)&name;
+ struct res_alloc *ra;
+ char * const *n = (char * const *)&name;
+ struct res_key key;
+ struct resource *resource;
+ fres_contract_ptr_seq vreses;
+ CORBA_Environment ev2;
+ forb_server_id app;
+#define GOTO(label, error) do { ret = (error); goto label; } while(0)
- ft = fcb_transaction_find(fcb, &n);
- if (!ft) {
- ret = FRES_ERR_TRANSACTION_NOT_FOUND;
- goto err;
+ ul_logmsg("Allocate transaction VRES '%s'[%d]\n", name, index);
+
+ ft = fcb_transaction_find(fcb, n);
+ if (!ft) GOTO(err, FRES_ERR_TRANSACTION_NOT_FOUND);
+
+ fc = tran_contract_indx2item(ft, index);
+ if (!fc) GOTO(err, FRSH_ERR_TOO_LARGE);
+
+ if (!get_fc_res_key(fc, &key))
+ GOTO(err, FRSH_ERR_RESOURCE_ID_INVALID);
+ resource = fcb_resource_find(fcb, &key);
+ if (!resource)
+ GOTO(err, FRES_ERR_NO_RESOURCE_MANAGER);
+
+ forb_get_req_source(_obj, &app);
+ /* Find allocator for the requested VRES */
+ 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);
+ GOTO(err, FRES_ERR_NO_RESOURCE_ALLOCATOR);
}
+ fc->ra = ra;
+
+ if (!forb_sequence_alloc_buf(&vreses, 1))
+ GOTO(err, errno);
+
+ assert(fc->schedulable_contract);
+ forb_sequence_elem(&vreses, 0) = fc->schedulable_contract;
+ forb_sequence_length(&vreses) = 1;
+ ret = fres_resource_allocator_change_vreses(ra->ra, &vreses, &ev2);
+ ul_logerr("Err = %d\n", ret);
+ if (forb_exception_occurred(&ev2))
+ GOTO(err_free, fres_forbex2err(&ev2));
+ if (ret)
+ goto err_free;
+ *id = fc->id;
+
ret = 0;
+err_free:
+ forb_sequence_free_buf(&vreses, forb_no_destructor);
err:
return ret;
}
WVTEST_MAIN("transaction negotiation")
{
frsh_contract_t contract[3];
- const frsh_resource_id_t id[3] = { 0, 1, 255 };
frsh_contract_label_t label[3];
frsh_rel_time_t budget, period;
int i;
frsh_transaction_t t;
- frsh_vres_id_t vres1, vres2;
+ frsh_vres_id_t vres0, vres1;
WVFRSH(frsh_init());
- WVFRSH(fra_dummy_init_and_activate_id(1));
WVFRSH(frsh_transaction_init(&t, "test"));
- for (i = TEST_CONTRACT_1; i <= TEST_CONTRACT_3; i++) {
+ for (i = TEST_CONTRACT_0; i <= TEST_CONTRACT_2; i++) {
WVFRSH(frsh_contract_init(&contract[i]));
sprintf(label[i], "contract%d", i);
WVFRSH(frsh_contract_set_resource_and_label(
&contract[i],
- DUMMY_RESOURCE_TYPE, id[i],
+ DUMMY_RESOURCE_TYPE, i,
label[i]));
budget = fosa_msec_to_rel_time(10);
WVFRSH(frsh_transaction_add_contract(&t, &contract[i], i));
}
- //WVPASS(frsh_transaction_alloc_vres(&t, TEST_CONTRACT_1, &vres1) == FRES_ERR_TRANSACTION_NOT_FOUND);
+ WVPASS(frsh_transaction_alloc_vres(&t, TEST_CONTRACT_0, &vres0) == FRES_ERR_TRANSACTION_NOT_FOUND);
WVFRSH(frsh_transaction_negotiate(&t));
-#if 0
+ WVFRSH(fra_dummy_init_and_activate_id(0));
+ WVFRSH(frsh_transaction_alloc_vres(&t, TEST_CONTRACT_0, &vres0));
+
+ WVPASS(frsh_transaction_alloc_vres(&t, TEST_CONTRACT_1, &vres1) == FRES_ERR_NO_RESOURCE_ALLOCATOR);
+ WVFRSH(fra_dummy_init_and_activate_id(1));
WVFRSH(frsh_transaction_alloc_vres(&t, TEST_CONTRACT_1, &vres1));
- WVFRSH(frsh_transaction_alloc_vres(&t, TEST_CONTRACT_2, &vres2));
- /* TEST_CONTRACT_3 is allocated in trans_nego2.c */
-
+ WVPASS(frsh_transaction_alloc_vres(&t, TEST_CONTRACT_2+1, &vres1) == FRSH_ERR_TOO_LARGE);
+ /* TEST_CONTRACT_2 is allocated in trans_nego2.c */
+#if 0
WVPASS(frsh_contract_cancel(vres2) == FRES_ERR_VRES_PART_OF_TRANSACTION);
#endif
frsh_destroy();
projects / frescor / frsh.git / commitdiff