A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add new model for cluster tag.
[simgrid.git]
/
src
/
simix
/
smx_host.c
diff --git
a/src/simix/smx_host.c
b/src/simix/smx_host.c
index
62e1113
..
7eac4a4
100644
(file)
--- a/
src/simix/smx_host.c
+++ b/
src/simix/smx_host.c
@@
-50,7
+50,7
@@
void SIMIX_host_destroy(void *h)
{
smx_host_t host = (smx_host_t) h;
- xbt_assert
0
((host != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
@@
-65,7
+65,7
@@
void SIMIX_host_destroy(void *h)
msg = tmp;
}
SIMIX_display_process_status();
- THROW
1
(arg_error, 0, "%s", msg);
+ THROW
F
(arg_error, 0, "%s", msg);
}
xbt_swag_free(host->process_list);
@@
-98,7
+98,7
@@
xbt_dict_t SIMIX_host_get_dict(void)
smx_host_t SIMIX_host_get_by_name(const char *name)
{
- xbt_assert
0
(((simix_global != NULL)
+ xbt_assert(((simix_global != NULL)
&& (host_lib != NULL)),
"Environment not set yet");
@@
-124,21
+124,21
@@
const char* SIMIX_host_self_get_name(void)
const char* SIMIX_host_get_name(smx_host_t host)
{
- xbt_assert
0
((host != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
return host->name;
}
xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
{
- xbt_assert
0
((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.get_properties(host->host);
}
double SIMIX_host_get_speed(smx_host_t host)
{
- xbt_assert
0
((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.
get_speed(host->host, 1.0);
@@
-146,7
+146,7
@@
double SIMIX_host_get_speed(smx_host_t host)
double SIMIX_host_get_available_speed(smx_host_t host)
{
- xbt_assert
0
((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.
get_available_speed(host->host);
@@
-154,7
+154,7
@@
double SIMIX_host_get_available_speed(smx_host_t host)
int SIMIX_host_get_state(smx_host_t host)
{
- xbt_assert
0
((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.
get_state(host->host);
@@
-172,15
+172,15
@@
void SIMIX_host_self_set_data(void *data)
void* SIMIX_host_get_data(smx_host_t host)
{
- xbt_assert
0
((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return host->data;
}
void SIMIX_host_set_data(smx_host_t host, void *data)
{
- xbt_assert
0
((host != NULL), "Invalid parameters");
- xbt_assert
0
((host->data == NULL), "Data already set");
+ xbt_assert((host != NULL), "Invalid parameters");
+ xbt_assert((host->data == NULL), "Data already set");
host->data = data;
}
@@
-209,10
+209,6
@@
smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
surf_workstation_model->set_priority(action->execution.surf_exec, priority);
}
-#ifdef HAVE_TRACING
- TRACE_smx_host_execute(action);
-#endif
-
XBT_DEBUG("Create execute action %p", action);
return action;
@@
-267,9
+263,6
@@
void SIMIX_host_execution_destroy(smx_action_t action)
action->execution.surf_exec = NULL;
}
-#ifdef HAVE_TRACING
- TRACE_smx_action_destroy(action);
-#endif
xbt_mallocator_release(simix_global->action_mallocator, action);
}
@@
-338,7
+331,7
@@
void SIMIX_host_execution_resume(smx_action_t action)
void SIMIX_execution_finish(smx_action_t action)
{
- xbt_fifo_item_t item;
+
volatile
xbt_fifo_item_t item;
smx_req_t req;
xbt_fifo_foreach(action->request_list, item, req, smx_req_t) {
@@
-346,14
+339,14
@@
void SIMIX_execution_finish(smx_action_t action)
switch (action->state) {
case SIMIX_DONE:
- /* do nothing, action done*/
+ /* do nothing, action done
*/
XBT_DEBUG("SIMIX_execution_finished: execution successful");
break;
case SIMIX_FAILED:
+ XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
TRY {
- XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
- THROW0(host_error, 0, "Host failed");
+ THROWF(host_error, 0, "Host failed");
}
CATCH(req->issuer->running_ctx->exception) {
req->issuer->doexception = 1;
@@
-361,9
+354,9
@@
void SIMIX_execution_finish(smx_action_t action)
break;
case SIMIX_CANCELED:
+ XBT_DEBUG("SIMIX_execution_finished: execution canceled");
TRY {
- XBT_DEBUG("SIMIX_execution_finished: execution canceled");
- THROW0(cancel_error, 0, "Canceled");
+ THROWF(cancel_error, 0, "Canceled");
}
CATCH(req->issuer->running_ctx->exception) {
req->issuer->doexception = 1;
@@
-371,7
+364,8
@@
void SIMIX_execution_finish(smx_action_t action)
break;
default:
- THROW_IMPOSSIBLE;
+ xbt_die("Internal error in SIMIX_execution_finish: unexpected action state %d",
+ action->state);
}
req->issuer->waiting_action = NULL;
req->host_execution_wait.result = action->state;