+/**************************************************************************/
+/* ---------------------------------------------------------------------- */
+/* Copyright (C) 2006 - 2008 FRESCOR consortium partners: */
+/* */
+/* Universidad de Cantabria, SPAIN */
+/* University of York, UK */
+/* Scuola Superiore Sant'Anna, ITALY */
+/* Kaiserslautern University, GERMANY */
+/* Univ. Politécnica Valencia, SPAIN */
+/* Czech Technical University in Prague, CZECH REPUBLIC */
+/* ENEA SWEDEN */
+/* Thales Communication S.A. FRANCE */
+/* Visual Tools S.A. SPAIN */
+/* Rapita Systems Ltd UK */
+/* Evidence ITALY */
+/* */
+/* See http://www.frescor.org for a link to partners' websites */
+/* */
+/* FRESCOR project (FP6/2005/IST/5-034026) is funded */
+/* in part by the European Union Sixth Framework Programme */
+/* The European Union is not liable of any use that may be */
+/* made of this code. */
+/* */
+/* */
+/* This file is part of FRSH (FRescor ScHeduler) */
+/* */
+/* FRSH is free software; you can redistribute it and/or modify it */
+/* under terms of the GNU General Public License as published by the */
+/* Free Software Foundation; either version 2, or (at your option) any */
+/* later version. FRSH is distributed in the hope that it will be */
+/* useful, but WITHOUT ANY WARRANTY; without even the implied warranty */
+/* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */
+/* General Public License for more details. You should have received a */
+/* copy of the GNU General Public License along with FRSH; see file */
+/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, */
+/* Cambridge, MA 02139, USA. */
+/* */
+/* As a special exception, including FRSH header files in a file, */
+/* instantiating FRSH generics or templates, or linking other files */
+/* with FRSH objects to produce an executable application, does not */
+/* by itself cause the resulting executable application to be covered */
+/* by the GNU General Public License. This exception does not */
+/* however invalidate any other reasons why the executable file might be */
+/* covered by the GNU Public License. */
+/**************************************************************************/
+
/**
* @file frm_generic.c
* @author Michal Sojka <sojkam1@fel.cvut.cz>
#include <fres_sa_scenario.h>
#include <fcb.h>
-UL_LOG_CUST(ulogd_frm);
-ul_log_domain_t ulogd_frm = {UL_LOGL_MSG, "frm"};
+UL_LOG_CUST(ulogd_frm_generic);
+ul_log_domain_t ulogd_frm_generic = {UL_LOGL_DEB, "frm"};
#define object_to_frm(o) (struct frm_data*)forb_instance_data(o)
#define save_errno(cmd) do { int _e = errno; cmd; errno = _e; } while(0)
for (i=0; i<contracts->_length; i++) {
struct fres_contract *cin = contracts->_buffer[i];
+
c = fres_sa_scenario_find_contract(scenario, &cin->id);
if (!c) {
c = fres_sa_contract_new();
}
}
if (!c) goto err;
+
+ {
+ char id[40];
+ char *operation;
+ fres_contract_id_to_string(id, &c->id, sizeof(id));
+ if (fres_contract_get_num_blocks(cin) == 0) operation = "cancelation";
+ else if (c->committed) operation = "renegotiation";
+ else if (c->reserved) operation = "negotiation (already reserved)";
+ else operation = "negotiation";
+ ul_logdeb(" reserve contract %s %s\n", id, operation);
+ }
assert(c->new == NULL);
c->new = fres_contract_duplicate(cin);
c->contract = c->new;
ret = frm->desc->admission_test(scenario, frm->desc->priv, &schedulable);
if (ret) {
- ul_logerr("admission_test failed: %d\n", ret);
+ ul_logmsg("admission_test failed: %d\n", ret);
goto err;
}
}
static void commit_contracts(fres_resource_manager obj,
- const fres_contract_id_seq* ids,
- fres_contract_ptr_seq** contracts_with_scheduling_data,
- CORBA_Environment *ev)
+ const fres_contract_id_seq* ids,
+ fres_contract_ptr_seq** contracts_with_scheduling_data,
+ CORBA_Environment *ev)
{
struct frm_data *frm = object_to_frm(obj);
int i, num;
* priorities). Question: How to recognize which contracts are
* changed because of this commit? */
for (i=0; i < num; i++) {
+ char id[40];
+ const char *operation;
+ fres_contract_id_to_string(id, &ids->_buffer[i], sizeof(id));
+
c = fres_sa_scenario_find_contract(frm->scenario, &ids->_buffer[i]);
if (c && c->reserved) {
- if (c->committed) fres_contract_destroy(c->committed);
- c->committed = c->reserved;
- c->reserved = NULL;
- contracts->_buffer[i] = fres_contract_duplicate(c->committed);
+ if (fres_contract_get_num_blocks(c->reserved) == 0) {
+ /* Cancelation request */
+ operation = "cancelation";
+ contracts->_buffer[i] = c->reserved;
+ c->reserved = NULL;
+ fres_sa_scenario_del_contract(frm->scenario, c);
+ fres_sa_contract_destroy(c);
+ } else {
+ /* Normal reservation */
+ if (c->committed) {
+ operation = "renegotiation";
+ fres_contract_destroy(c->committed);
+ } else {
+ operation = "negotiation";
+ }
+ c->committed = c->reserved;
+ c->reserved = NULL;
+ contracts->_buffer[i] = fres_contract_duplicate(c->committed);
+ }
} else {
+ operation = "error";
contracts->_buffer[i] = NULL;
if (!c) ul_logerr("Commit to unknown contract ID\n");
else if (!c->reserved) ul_logerr("Commit to not reserved contract\n");
}
+
+ ul_logdeb(" commit contract %s %s\n", id, operation);
}
-
+
*contracts_with_scheduling_data = contracts;
err:;
}
-static void cancel_contracts(fres_resource_manager obj,
- const fres_contract_id_seq* ids,
- CORBA_Environment *ev)
+static void cancel_reservations(fres_resource_manager obj,
+ const fres_contract_id_seq* ids,
+ CORBA_Environment *ev)
{
int i;
struct frm_data *frm = object_to_frm(obj);
- ul_logmsg("cancel_contracts\n");
+ ul_logmsg("cancel_reservations\n");
for (i=0; i<ids->_length; i++) {
struct fres_sa_contract *c;
c = fres_sa_scenario_find_contract(frm->scenario, &ids->_buffer[i]);
- if (c) {
- fres_sa_scenario_del_contract(frm->scenario, c);
- fres_sa_contract_destroy(c);
+ if (c->reserved) {
+ if (c->committed) {
+ /* Roll-back renegotiation */
+ fres_contract_destroy(c->reserved);
+ c->reserved = NULL;
+ c->contract = c->committed;
+ } else {
+ /* Roll-back negotiation */
+ fres_sa_scenario_del_contract(frm->scenario, c);
+ fres_sa_contract_destroy(c);
+ }
}
}
}
+static void get_contracts(fres_resource_manager obj,
+ fres_contract_ptr_seq** contracts_out,
+ CORBA_long* utilization, CORBA_Environment *ev)
+{
+ struct frm_data *frm = object_to_frm(obj);
+ struct fres_sa_contract *c;
+ fres_contract_ptr_seq *contracts;
+
+ contracts = forb_malloc(sizeof(*contracts));
+ if (!contracts) {
+ ev->major = FORB_EX_NO_MEMORY;
+ goto err;
+ }
+ contracts->_buffer = CORBA_sequence_fres_contract_ptr_allocbuf(frm->scenario->num_contracts);
+ CORBA_sequence_set_release(contracts, CORBA_TRUE);
+ contracts->_maximum = frm->scenario->num_contracts;
+ contracts->_length = 0;
+
+ fres_sa_scenario_for_each_contract(frm->scenario, c) {
+ if (c->committed) {
+ int i = contracts->_length;
+ contracts->_buffer[i] = fres_contract_duplicate(c->committed);
+ contracts->_length++;
+ }
+
+ }
+ *contracts_out = contracts;
+ *utilization = frm->scenario->utilization;
+err:;
+}
+
+
static const struct forb_fres_resource_manager_impl frm_impl = {
.reserve_contracts = reserve_contracts,
.commit_contracts = commit_contracts,
- .cancel_contracts = cancel_contracts,
+ .cancel_reservations = cancel_reservations,
+ .get_contracts = get_contracts,
};
/**