Make sure that created sequential tasks cannot look like parallel tasks because of...

[simgrid.git] / src / msg / private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index b8f05b1..37e18f5 100644 (file)
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -1,8 +1,5 @@
-/*     $Id$      */
-
-/* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
-/* Copyright (c) 2007 Bruno Donassolo.                                      */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2004, 2005, 2006, 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. */
@@ -10,7 +7,6 @@
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 
-#include <stdio.h>
 #include "msg/msg.h"
 #include "simix/simix.h"
 #include "surf/surf.h"
@@ -19,6 +15,7 @@
 #include "xbt/swag.h"
 #include "xbt/dict.h"
 #include "xbt/config.h"
+#include "instr/private.h"
 
 SG_BEGIN_DECL()
 
@@ -51,8 +48,8 @@ SG_BEGIN_DECL()
        double priority;
        double rate;
        int refcount;
+       int host_nb; /* ==0 if sequential task; parallel task if not */
   /*******  Parallel Tasks Only !!!! *******/
-       int host_nb;
        smx_host_t *host_list;
        double *comp_amount;
        double *comm_amount;
@@ -68,6 +65,7 @@ SG_BEGIN_DECL()
        m_host_t put_host;       /* used for debugging purposes */
        m_channel_t put_channel; /* used for debugging purposes */
        smx_action_t waiting_action;
+       m_task_t waiting_task;
        int argc;                /* arguments number if any */
        char **argv;             /* arguments table if any */
        MSG_error_t last_errno;  /* the last value returned by a MSG_function */
@@ -121,6 +119,7 @@ XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
      void _MSG_process_kill_from_SIMIX(void *p);
 
      void _MSG_action_init(void);
+     void _MSG_action_exit(void);
 
 SG_END_DECL()
 #endif