* Move headers around to sort them out on installed systems:
- instr/instr.h -> simgrid/instr.h
- instr/jedule/* -> simgrid/jedule
+ - simdag/datatypes.h was removed
+ - simdag/simdag.h -> simgrid/simdag.h
-- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
)
set(JEDULE_SRC
- include/instr/jedule/jedule_events.h
- include/instr/jedule/jedule_output.h
- include/instr/jedule/jedule_platform.h
- include/instr/jedule/jedule_sd_binding.h
+ include/simgrid/jedule/jedule_events.h
+ include/simgrid/jedule/jedule_output.h
+ include/simgrid/jedule/jedule_platform.h
+ include/simgrid/jedule/jedule_sd_binding.h
src/instr/jedule/jedule_events.c
src/instr/jedule/jedule_output.c
src/instr/jedule/jedule_platform.c
)
set(headers_to_install
- include/instr/instr.h
+ include/simgrid/instr.h
include/msg/datatypes.h
include/msg/msg.h
- include/simdag/datatypes.h
- include/simdag/simdag.h
+ include/simgrid/simdag.h
include/simgrid.h
include/simgrid/datatypes.h
include/simgrid/modelchecker.h
@top_srcdir@/include/ \
@top_srcdir@/include/msg \
@top_srcdir@/include/xbt \
- @top_srcdir@/include/simdag \
@top_srcdir@/include/simgrid \
@top_srcdir@/src/include/surf \
@top_srcdir@/src/xbt/ \
${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_typed_tasks.tesh
${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_avail.tesh
${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_fail.tesh
- ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_fail_notrace.tesh
PARENT_SCOPE
)
set(xml_files
${tesh_files}
${CMAKE_CURRENT_SOURCE_DIR}/simple_dax_with_cycle.tesh
${CMAKE_CURRENT_SOURCE_DIR}/smalldax.tesh
- ${CMAKE_CURRENT_SOURCE_DIR}/smalldax_notrace.tesh
PARENT_SCOPE
)
set(xml_files
#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>
set(tesh_files
${tesh_files}
${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_dotload.tesh
- ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_dotload_notrace.tesh
PARENT_SCOPE
)
set(xml_files
#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>
#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>
#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>
#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>
#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>
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
#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>
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include <stdlib.h>
#include <string.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
#include "xbt/sysdep.h" /* calloc, printf */
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/ex.h"
#include "xbt/log.h"
+++ /dev/null
-/* Copyright (c) 2006, 2008-2014. 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. */
-
-#ifndef SIMDAG_DATATYPES_H
-#define SIMDAG_DATATYPES_H
-#include "xbt/dict.h"
-
-/** @brief Workstation datatype
- @ingroup SD_datatypes_management
-
- A workstation is a place where a task can be executed.
- A workstation is represented as a <em>physical
- resource with computing capabilities</em> and has a <em>name</em>.
-
- @see SD_workstation_management */
-typedef xbt_dictelm_t SD_workstation_t;
-
-/** @brief Workstation access mode
- @ingroup SD_datatypes_management
-
- By default, a workstation resource is shared, i.e. several tasks
- can be executed at the same time on a workstation. The CPU power of
- the workstation is shared between the running tasks on the workstation.
- In sequential mode, only one task can use the workstation, and the other
- tasks wait in a FIFO.
-
- @see SD_workstation_get_access_mode(), SD_workstation_set_access_mode() */
-typedef enum {
- SD_WORKSTATION_SHARED_ACCESS, /**< @brief Several tasks can be executed at the same time */
- SD_WORKSTATION_SEQUENTIAL_ACCESS /**< @brief Only one task can be executed, the others wait in a FIFO. */
-} e_SD_workstation_access_mode_t;
-
-typedef enum {
- SD_LINK_SHARED,
- SD_LINK_FATPIPE
-} e_SD_link_sharing_policy_t;
-
-/** @brief Link datatype
- @ingroup SD_datatypes_management
-
- A link is a network node represented as a <em>name</em>, a <em>current
- bandwidth</em> and a <em>current latency</em>. A route is a list of
- links between two workstations.
-
- @see SD_link_management */
-typedef struct SD_link *SD_link_t;
-
-/** @brief Task datatype
- @ingroup SD_datatypes_management
-
- A task is some <em>computing amount</em> that can be executed
- in parallel on several workstations. A task may depend on other
- tasks, this means that the task cannot start until the other tasks are done.
- Each task has a <em>\ref e_SD_task_state_t "state"</em> indicating whether
- the task is scheduled, running, done, etc.
-
- @see SD_task_management */
-typedef struct SD_task *SD_task_t;
-
-/** @brief Task states
- @ingroup SD_datatypes_management
-
- @see SD_task_management */
-typedef enum {
- SD_NOT_SCHEDULED = 0, /**< @brief Initial state (not valid for SD_watch and SD_unwatch). */
- SD_SCHEDULABLE = 0x0001, /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */
- SD_SCHEDULED = 0x0002, /**< @brief A task becomes SD_SCHEDULED when you call function
- SD_task_schedule. SD_simulate will execute it when it becomes SD_RUNNABLE. */
- SD_RUNNABLE = 0x0004, /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */
- SD_IN_FIFO = 0x0008, /**< @brief A runnable task can have to wait in a workstation fifo if the workstation is sequential */
- SD_RUNNING = 0x0010, /**< @brief An SD_RUNNABLE or SD_IN_FIFO becomes SD_RUNNING when it is launched. */
- SD_DONE = 0x0020, /**< @brief The task is successfully finished. */
- SD_FAILED = 0x0040 /**< @brief A problem occurred during the execution of the task. */
-} e_SD_task_state_t;
-
-/** @brief Task kinds
- @ingroup SD_datatypes_management
-
- @see SD_task_management */
-typedef enum {
- SD_TASK_NOT_TYPED = 0, /**< @brief no specified type */
- SD_TASK_COMM_E2E = 1, /**< @brief end to end communication */
- SD_TASK_COMP_SEQ = 2, /**< @brief sequential computation */
- SD_TASK_COMP_PAR_AMDAHL = 3, /**< @brief parallel computation (Amdahl's law) */
- SD_TASK_COMM_PAR_MXN_1D_BLOCK = 4 /**< @brief MxN data redistribution (1D Block distribution) */
-} e_SD_task_kind_t;
-
-
-/** @brief Storage datatype
- @ingroup SD_datatypes_management
-
- TODO PV: comment it !
-
- @see SD_storage_management */
-typedef xbt_dictelm_t SD_storage_t;
-
-#endif
#include "xbt.h"
#include "xbt/graph.h"
#include "msg/msg.h"
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
/*
* Functions to manage tracing categories
#define JEDULE_SD_BINDING_H_
#include "simgrid_config.h"
-
-#include "simdag/datatypes.h"
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#ifdef HAVE_JEDULE
#ifndef SIMDAG_SIMDAG_H
#define SIMDAG_SIMDAG_H
-#include "simdag/datatypes.h"
#include "xbt/misc.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
SG_BEGIN_DECL()
+/** @brief Workstation datatype
+ @ingroup SD_datatypes_management
+
+ A workstation is a place where a task can be executed.
+ A workstation is represented as a <em>physical
+ resource with computing capabilities</em> and has a <em>name</em>.
+
+ @see SD_workstation_management */
+typedef xbt_dictelm_t SD_workstation_t;
+
+/** @brief Workstation access mode
+ @ingroup SD_datatypes_management
+
+ By default, a workstation resource is shared, i.e. several tasks
+ can be executed at the same time on a workstation. The CPU power of
+ the workstation is shared between the running tasks on the workstation.
+ In sequential mode, only one task can use the workstation, and the other
+ tasks wait in a FIFO.
+
+ @see SD_workstation_get_access_mode(), SD_workstation_set_access_mode() */
+typedef enum {
+ SD_WORKSTATION_SHARED_ACCESS, /**< @brief Several tasks can be executed at the same time */
+ SD_WORKSTATION_SEQUENTIAL_ACCESS /**< @brief Only one task can be executed, the others wait in a FIFO. */
+} e_SD_workstation_access_mode_t;
+
+typedef enum {
+ SD_LINK_SHARED,
+ SD_LINK_FATPIPE
+} e_SD_link_sharing_policy_t;
+
+/** @brief Link datatype
+ @ingroup SD_datatypes_management
+
+ A link is a network node represented as a <em>name</em>, a <em>current
+ bandwidth</em> and a <em>current latency</em>. A route is a list of
+ links between two workstations.
+
+ @see SD_link_management */
+typedef struct SD_link *SD_link_t;
+
+/** @brief Task datatype
+ @ingroup SD_datatypes_management
+
+ A task is some <em>computing amount</em> that can be executed
+ in parallel on several workstations. A task may depend on other
+ tasks, this means that the task cannot start until the other tasks are done.
+ Each task has a <em>\ref e_SD_task_state_t "state"</em> indicating whether
+ the task is scheduled, running, done, etc.
+
+ @see SD_task_management */
+typedef struct SD_task *SD_task_t;
+
+/** @brief Task states
+ @ingroup SD_datatypes_management
+
+ @see SD_task_management */
+typedef enum {
+ SD_NOT_SCHEDULED = 0, /**< @brief Initial state (not valid for SD_watch and SD_unwatch). */
+ SD_SCHEDULABLE = 0x0001, /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */
+ SD_SCHEDULED = 0x0002, /**< @brief A task becomes SD_SCHEDULED when you call function
+ SD_task_schedule. SD_simulate will execute it when it becomes SD_RUNNABLE. */
+ SD_RUNNABLE = 0x0004, /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */
+ SD_IN_FIFO = 0x0008, /**< @brief A runnable task can have to wait in a workstation fifo if the workstation is sequential */
+ SD_RUNNING = 0x0010, /**< @brief An SD_RUNNABLE or SD_IN_FIFO becomes SD_RUNNING when it is launched. */
+ SD_DONE = 0x0020, /**< @brief The task is successfully finished. */
+ SD_FAILED = 0x0040 /**< @brief A problem occurred during the execution of the task. */
+} e_SD_task_state_t;
+
+/** @brief Task kinds
+ @ingroup SD_datatypes_management
+
+ @see SD_task_management */
+typedef enum {
+ SD_TASK_NOT_TYPED = 0, /**< @brief no specified type */
+ SD_TASK_COMM_E2E = 1, /**< @brief end to end communication */
+ SD_TASK_COMP_SEQ = 2, /**< @brief sequential computation */
+ SD_TASK_COMP_PAR_AMDAHL = 3, /**< @brief parallel computation (Amdahl's law) */
+ SD_TASK_COMM_PAR_MXN_1D_BLOCK = 4 /**< @brief MxN data redistribution (1D Block distribution) */
+} e_SD_task_kind_t;
+
+
+/** @brief Storage datatype
+ @ingroup SD_datatypes_management
+
+ TODO PV: comment it !
+
+ @see SD_storage_management */
+typedef xbt_dictelm_t SD_storage_t;
/************************** AS handling *************************************/
XBT_PUBLIC(xbt_dict_t) SD_as_router_get_properties(const char *as);
#include "lua_utils.h"
#include "xbt.h"
#include "msg/msg.h"
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "surf/surfxml_parse.h"
#include <lauxlib.h>
#include "instr/instr_private.h"
#include "private.h"
-#include "simdag/datatypes.h"
-
+#include "simgrid/simdag.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_sd, instr, "SD");
#include "xbt/dict.h"
#include "xbt/dynar.h"
#include "xbt/fifo.h"
-#include "simdag/simdag.h"
-#include "simdag/datatypes.h"
+#include "simgrid/simdag.h"
#include "surf/surf.h"
#include "xbt/swag.h"
#include "xbt/mallocator.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/misc.h"
#include "xbt/log.h"
#include <libgen.h>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/misc.h"
#include "xbt/log.h"
#include <stdbool.h>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/dict.h"
#include "xbt/sysdep.h"
#include "surf/surf.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/sysdep.h"
#include "xbt/dynar.h"
#include "instr/instr_private.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/dict.h"
#include "xbt/lib.h"
#include "xbt/sysdep.h"
#include <string.h>
#include <stddef.h>
#include <unistd.h>
-#include <simdag/simdag.h>
+#include <simgrid/simdag.h>
#include <xbt/log.h>
#include <xbt/ex.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic0, sd, "SimDag test basic0");
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic1, sd, "SimDag test basic1");
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic2, sd, "SimDag test basic2");
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic3, sd, "SimDag test basic3");
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic4, sd, "SimDag test basic4");
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic5, sd, "SimDag test basic5");
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/asserts.h"
#include "xbt/log.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(incomplete, sd, "SimDag incomplete test");
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
/*
* intra communication test
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
/*
* intra communication test
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
/*
* intra communication test 1
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
/*
* simple latency test
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
/*
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
/**
* bw and latency test 3
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#define TASK_NUM 3
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
/*
* This test checks if the reinitialization of
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
int main(int argc, char **argv)
{
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
int main(int argc, char **argv)
{
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "surf/surf_private.h"
#include "xbt/xbt_os_time.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "surf/surf_private.h"
#include "xbt/xbt_os_time.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "surf/surf_private.h"
#include "xbt/log.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "surf/surf_private.h"
int main(int argc, char **argv)
#include <math.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
#include "xbt/dict.h"
#include "xbt/ex.h"
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
#include "surf/surf_private.h"
extern routing_platf_t routing_platf;
