-/* $Id$ */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
- All rights reserved. */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
XBT_LOG_EXTERNAL_CATEGORY(simix_process);
XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
XBT_LOG_EXTERNAL_CATEGORY(simix_context);
-XBT_LOG_EXTERNAL_CATEGORY(simix_network);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
"Logging specific to SIMIX (kernel)");
XBT_LOG_CONNECT(simix_process, simix);
XBT_LOG_CONNECT(simix_synchro, simix);
XBT_LOG_CONNECT(simix_context, simix);
- XBT_LOG_CONNECT(simix_network, simix);
simix_global = xbt_new0(s_SIMIX_Global_t, 1);
simix_global->host = xbt_dict_new();
simix_global->process_to_run =
- xbt_swag_new(xbt_swag_offset(proc, synchro_hookup));
+ xbt_swag_new(xbt_swag_offset(proc, synchro_hookup));
simix_global->process_list =
- xbt_swag_new(xbt_swag_offset(proc, process_hookup));
+ xbt_swag_new(xbt_swag_offset(proc, process_hookup));
simix_global->process_to_destroy =
- xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
+ xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
simix_global->current_process = NULL;
simix_global->maestro_process = NULL;
smx_action_t act;
int nbprocess = xbt_swag_size(simix_global->process_list);
- INFO1("%d processes are still running, waiting for something.", nbprocess);
+ INFO1("%d processes are still running, waiting for something.",
+ nbprocess);
/* List the process and their state */
INFO0
- ("Legend of the following listing: \"<process> on <host>: <status>.\"");
+
("Legend of the following listing: \"<process> on <host>: <status>.\"");
xbt_swag_foreach(process, simix_global->process_list) {
char *who, *who2;
- asprintf(&who, "%s on %s: %s",
- process->name,
- process->smx_host->name,
- (process->blocked) ? "[BLOCKED] "
- : ((process->suspended) ? "[SUSPENDED] " : ""));
+ who = bprintf("%s on %s: %s",
+ process->name,
+ process->smx_host->name,
+ (process->blocked) ? "[BLOCKED] "
+ : ((process->suspended) ? "[SUSPENDED] " : ""));
if (process->mutex) {
who2 =
- bprintf("%s Blocked on mutex %p", who,
- (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
- process->mutex : (void *) 0xdead);
+ bprintf("%s Blocked on mutex %p", who,
+ (XBT_LOG_ISENABLED
+ (simix_kernel,
+ xbt_log_priority_verbose)) ? process->mutex : (void *)
+ 0xdead);
free(who);
who = who2;
} else if (process->cond) {
who2 =
- bprintf
- ("%s Blocked on condition %p; Waiting for the following actions:",
- who,
- (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
- process->cond : (void *) 0xdead);
+ bprintf
+ ("%s Blocked on condition %p; Waiting for the following actions:",
+ who,
+ (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
+ process->cond : (void *) 0xdead);
free(who);
who = who2;
xbt_fifo_foreach(process->cond->actions, item, act, smx_action_t) {
who2 =
- bprintf("%s '%s'(%p)", who, act->name,
- (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose))
- ? act : (void *) 0xdead);
+ bprintf("%s '%s'(%p)", who, act->name,
+ (XBT_LOG_ISENABLED
+ (simix_kernel, xbt_log_priority_verbose))
+ ? act : (void *) 0xdead);
+ free(who);
+ who = who2;
+ }
+ } else if (process->sem) {
+ who2 =
+ bprintf
+ ("%s Blocked on semaphore %p; Waiting for the following actions:",
+ who,
+ (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
+ process->sem : (void *) 0xdead);
+ free(who);
+ who = who2;
+ xbt_fifo_foreach(process->sem->actions, item, act, smx_action_t) {
+ who2 =
+ bprintf("%s '%s'(%p)", who, act->name,
+ (XBT_LOG_ISENABLED
+ (simix_kernel, xbt_log_priority_verbose))
+ ? act : (void *) 0xdead);
free(who);
who = who2;
}
+
} else {
who2 =
- bprintf
- ("%s Blocked in an unknown status (please report this bug)", who);
+ bprintf
+ ("%s Blocked in an unknown status (please report this bug)",
+ who);
free(who);
who = who2;
}
*
* \return Return the clock.
*/
-double SIMIX_get_clock(void)
+XBT_INLINE double SIMIX_get_clock(void)
{
return surf_get_clock();
}
*
* Must be called before the first call to SIMIX_solve()
*/
-void SIMIX_init(void)
+XBT_INLINE void SIMIX_init(void)
{
surf_presolve();
}
int actions_on_system = 0;
SIMIX_process_empty_trash();
- if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
+ if (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug) &&
+ xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
DEBUG0("**************************************************");
}
xbt_free(args);
continue;
}
+
if (args->kill_time > SIMIX_get_clock()) {
surf_timer_model->extension.timer.set(args->kill_time, (void *)
&SIMIX_process_kill,
(void *) process);
}
xbt_free(args);
- }
- if (fun == simix_global->create_process_function) {
+ } else if (fun == simix_global->create_process_function) {
smx_process_arg_t args = arg;
DEBUG2("Launching %s on %s", args->name, args->hostname);
process =
- (*simix_global->create_process_function) (args->name, args->code,
- args->data,
- args->hostname,
- args->argc, args->argv,
- args->properties);
+ (*simix_global->create_process_function) (args->name,
+ args->code,
+ args->data,
+ args->hostname,
+ args->argc,
+ args->argv,
+ args->properties);
/* verify if process has been created */
if (!process) {
xbt_free(args);
(void *) process);
}
xbt_free(args);
- }
- if (fun == SIMIX_process_kill) {
+ } else if (fun == SIMIX_process_kill) {
process = arg;
DEBUG2("Killing %s on %s", process->name, process->smx_host->name);
SIMIX_process_kill(process);
- }
- if (fun == simix_global->kill_process_function) {
+ } else if (fun == simix_global->kill_process_function) {
process = arg;
(*simix_global->kill_process_function) (process);
+ } else {
+ THROW_IMPOSSIBLE;
}
}
while ((action = xbt_swag_extract(model->states.done_action_set))) {
smx_action = action->data;
if (smx_action) {
- /* Copy the transfered data of the completed communication actions */
- /* FIXME: find a better way to determine if its a comm action */
- if(smx_action->data != NULL) {
- CDEBUG1(simix_network,"Communication %p finished",smx_action->data);
- SIMIX_network_copy_data((smx_comm_t)smx_action->data);
- }
- SIMIX_action_signal_all(smx_action);
+ SIMIX_action_signal_all(smx_action);
}
}
}
* \param arg Parameters of the function
*
*/
-void SIMIX_timer_set(double date, void *function, void *arg)
+XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg)
{
surf_timer_model->extension.timer.set(date, function, arg);
}
-int SIMIX_timer_get(void **function, void **arg)
+XBT_INLINE int SIMIX_timer_get(void **function, void **arg)
{
return surf_timer_model->extension.timer.get(function, arg);
}
* \param function Create process function
*
*/
-void SIMIX_function_register_process_create(smx_creation_func_t function)
+XBT_INLINE void SIMIX_function_register_process_create(smx_creation_func_t
+ function)
{
xbt_assert0((simix_global->create_process_function == NULL),
"Data already set");
* \param function Kill process function
*
*/
-void SIMIX_function_register_process_kill(void_f_pvoid_t function)
+XBT_INLINE void SIMIX_function_register_process_kill(void_f_pvoid_t
+ function)
{
xbt_assert0((simix_global->kill_process_function == NULL),
"Data already set");
* \param function cleanup process function
*
*/
-void SIMIX_function_register_process_cleanup(void_f_pvoid_t function)
+XBT_INLINE void SIMIX_function_register_process_cleanup(void_f_pvoid_t
+ function)
{
simix_global->cleanup_process_function = function;
}
