/* simple test to schedule a DAX file with the Min-Min algorithm. */
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <stdlib.h>
#include <stdio.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
#include "xbt/ex.h"
#include <string.h>
typedef struct _WorkstationAttribute *WorkstationAttribute;
struct _WorkstationAttribute {
- /* Earliest time at wich a workstation is ready to execute a task */
+ /* Earliest time at which a workstation is ready to execute a task */
double available_at;
+ SD_task_t last_scheduled_task;
};
static void SD_workstation_allocate_attribute(SD_workstation_t workstation)
SD_workstation_set_data(workstation, attr);
}
+static SD_task_t SD_workstation_get_last_scheduled_task( SD_workstation_t workstation){
+ WorkstationAttribute attr =
+ (WorkstationAttribute) SD_workstation_get_data(workstation);
+ return attr->last_scheduled_task;
+}
+
+static void SD_workstation_set_last_scheduled_task(SD_workstation_t workstation,
+ SD_task_t task){
+ WorkstationAttribute attr =
+ (WorkstationAttribute) SD_workstation_get_data(workstation);
+ attr->last_scheduled_task=task;
+ SD_workstation_set_data(workstation, attr);
+}
static xbt_dynar_t get_ready_tasks(xbt_dynar_t dax)
{
parents = SD_task_get_parents(task);
- if (xbt_dynar_length(parents)) {
+ if (!xbt_dynar_is_empty(parents)) {
/* compute last_data_available */
last_data_available = -1.0;
xbt_dynar_foreach(parents, i, parent) {
if (SD_task_get_kind(parent) == SD_TASK_COMM_E2E) {
grand_parents = SD_task_get_parents(parent);
- if (xbt_dynar_length(grand_parents) > 1) {
- XBT_ERROR("Warning: transfer %s has 2 parents",
- SD_task_get_name(parent));
- }
+ xbt_assert(xbt_dynar_length(grand_parents) <2,
+ "Error: transfer %s has 2 parents",
+ SD_task_get_name(parent));
+
xbt_dynar_get_cpy(grand_parents, 0, &grand_parent);
grand_parent_workstation_list =
int i;
double EFT, min_EFT = -1.0;
const SD_workstation_t *workstations = SD_workstation_get_list();
- int nworkstations = SD_workstation_get_number();
+ int nworkstations = SD_workstation_get_count();
SD_workstation_t best_workstation;
best_workstation = workstations[0];
{
unsigned int i, j, k;
int current_nworkstations;
- const int nworkstations = SD_workstation_get_number();
+ const int nworkstations = SD_workstation_get_count();
const SD_workstation_t *workstations = SD_workstation_get_list();
SD_task_t task;
SD_workstation_t *list;
{
unsigned int cursor;
double finish_time, min_finish_time = -1.0;
- SD_task_t task, selected_task = NULL;
+ SD_task_t task, selected_task = NULL, last_scheduled_task;
xbt_dynar_t ready_tasks;
SD_workstation_t workstation, selected_workstation = NULL;
int total_nworkstations = 0;
const SD_workstation_t *workstations = NULL;
- xbt_dynar_t dax, changed;
+ xbt_dynar_t dax;
FILE *out = NULL;
/* initialization of SD */
SD_init(&argc, argv);
/* Check our arguments */
- if (argc < 3) {
- XBT_INFO("Usage: %s platform_file dax_file [jedule_file]", argv[0]);
- XBT_INFO
- ("example: %s simulacrum_7_hosts.xml Montage_25.xml Montage_25.jed",
- argv[0]);
- exit(1);
- }
- char *tracefilename;
- if (argc == 3) {
- char *last = strrchr(argv[2], '.');
-
- tracefilename = bprintf("%.*s.jed",
- (int) (last ==
- NULL ? strlen(argv[2]) : last -
- argv[2]), argv[2]);
- } else {
+ xbt_assert(argc > 2, "Usage: %s platform_file dax_file [jedule_file]\n"
+ "\tExample: %s simulacrum_7_hosts.xml Montage_25.xml Montage_25.jed",
+ argv[0], argv[0]);
+
+ char *last = strrchr(argv[2], '.');
+ char * tracefilename = bprintf("%.*s.jed",(int) (last == NULL ?
+ strlen(argv[2]) :
+ last - argv[2]), argv[2]);
+ if (argc == 4)
tracefilename = xbt_strdup(argv[3]);
- }
/* creation of the environment */
SD_create_environment(argv[1]);
/* Allocating the workstation attribute */
- total_nworkstations = SD_workstation_get_number();
+ total_nworkstations = SD_workstation_get_count();
workstations = SD_workstation_get_list();
for (cursor = 0; cursor < total_nworkstations; cursor++)
workstation = SD_task_get_best_workstation(task);
SD_task_schedulel(task, 1, workstation);
- while (!xbt_dynar_is_empty((changed = SD_simulate(-1.0)))) {
+ while (!xbt_dynar_is_empty(SD_simulate(-1.0))) {
/* Get the set of ready tasks */
ready_tasks = get_ready_tasks(dax);
- if (!xbt_dynar_length(ready_tasks)) {
+ if (xbt_dynar_is_empty(ready_tasks)) {
xbt_dynar_free_container(&ready_tasks);
- xbt_dynar_free_container(&changed);
/* there is no ready task, let advance the simulation */
continue;
}
SD_workstation_get_name(selected_workstation));
SD_task_schedulel(selected_task, 1, selected_workstation);
+
+ /*
+ * SimDag allows tasks to be executed concurrently when they can by default.
+ * Yet schedulers take decisions assuming that tasks wait for resource
+ * availability to start.
+ * The solution (well crude hack is to keep track of the last task scheduled
+ * on a workstation and add a special type of dependency if needed to
+ * force the sequential execution meant by the scheduler.
+ * If the last scheduled task is already done, has failed or is a
+ * predecessor of the current task, no need for a new dependency
+ */
+
+ last_scheduled_task =
+ SD_workstation_get_last_scheduled_task(selected_workstation);
+ if (last_scheduled_task &&
+ (SD_task_get_state(last_scheduled_task) != SD_DONE) &&
+ (SD_task_get_state(last_scheduled_task) != SD_FAILED) &&
+ !SD_task_dependency_exists(
+ SD_workstation_get_last_scheduled_task(selected_workstation),
+ selected_task))
+ SD_task_dependency_add("resource", NULL,
+ last_scheduled_task, selected_task);
+
+ SD_workstation_set_last_scheduled_task(selected_workstation, selected_task);
+
SD_workstation_set_available_at(selected_workstation, min_finish_time);
xbt_dynar_free_container(&ready_tasks);
/* reset the min_finish_time for the next set of ready tasks */
min_finish_time = -1.;
- xbt_dynar_free_container(&changed);
}
XBT_INFO("Simulation Time: %f", SD_get_clock());
xbt_dynar_free_container(&ready_tasks);
- xbt_dynar_free_container(&changed);
xbt_dynar_foreach(dax, cursor, task) {
SD_task_destroy(task);