- while ((process = xbt_swag_extract(simix_global->process_to_run))) {
- DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
- SIMIX_process_schedule(process);
- }
-
- {
- surf_action_t action = NULL;
- surf_model_t model = NULL;
- smx_action_t smx_action = NULL;
-
- void *fun = NULL;
- void *arg = NULL;
-
- xbt_dynar_foreach(model_list, iter, model) {
- if (xbt_swag_size(model->states.failed_action_set)
- || xbt_swag_size(model->states.done_action_set)) {
- state_modifications = 1;
- break;
- }
- if (xbt_swag_size(model->states.running_action_set)
- || xbt_swag_size(model->states.ready_action_set)) {
- actions_on_system = 1;
- }
- }
- /* only calls surf_solve if there are actions to run */
- if (!state_modifications && actions_on_system) {
- DEBUG1("%f : Calling surf_solve", SIMIX_get_clock());
- elapsed_time = surf_solve();
- DEBUG1("Elapsed_time %f", elapsed_time);
- }
-
- actions_on_system = 0;
- while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) {
- /* change in process, don't quit */
- actions_on_system = 1;
- DEBUG2("got %p %p", fun, arg);
- if (fun == SIMIX_process_create) {
- smx_process_arg_t args = arg;
- DEBUG2("Launching %s on %s", args->name, args->hostname);
- process = SIMIX_process_create(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);
- 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) {
- 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);
- /* verify if process has been created */
- if (!process) {
- xbt_free(args);
- continue;
- }
- if (args->kill_time > SIMIX_get_clock()) {
- if (simix_global->kill_process_function)
- surf_timer_model->extension.timer.set(args->kill_time, (void *)
- simix_global->
- kill_process_function,
- process);
- else
- surf_timer_model->extension.timer.set(args->kill_time, (void *)
- &SIMIX_process_kill,
- (void *) process);
+ do {
+ XBT_DEBUG("New Schedule Round; size(queue)=%lu",
+ xbt_dynar_length(simix_global->process_to_run));
+#ifdef TIME_BENCH
+ smx_ctx_raw_new_sr();
+#endif
+ while (!xbt_dynar_is_empty(simix_global->process_to_run)) {
+ XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu",
+ xbt_dynar_length(simix_global->process_to_run));
+ SIMIX_process_runall();
+ xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
+ if (process->simcall.call != SIMCALL_NONE) {
+ SIMIX_simcall_pre(&process->simcall, 0);