-/* $Id$ */
+/* $Id$ */
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2002-2007 Arnaud Legrand. */
+/* Copyright (c) 2007 Bruno Donassolo. */
+/* 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. */
-#include"private.h"
-#include"xbt/sysdep.h"
-#include "xbt/error.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(environment, msg,
- "Logging specific to MSG (environment)");
+#include "msg/private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "xbt/dict.h"
+
+/** \defgroup msg_easier_life Platform and Application management
+ * \brief This section describes functions to manage the platform creation
+ * and the application deployment. You should also have a look at
+ * \ref MSG_examples to have an overview of their usage.
+ */
+/** @addtogroup msg_easier_life
+ * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Platforms and Applications" --> \endhtmlonly
+ *
+ */
/********************************* MSG **************************************/
*/
m_host_t MSG_get_host_by_name(const char *name)
{
- xbt_fifo_item_t i = NULL;
- m_host_t host = NULL;
+ smx_host_t simix_h = NULL;
- xbt_assert0(((msg_global != NULL)
- && (msg_global->host != NULL)), "Environment not set yet");
-
- xbt_fifo_foreach(msg_global->host,i,host,m_host_t) {
- if(strcmp(host->name, name) == 0) return host;
- }
- return NULL;
+ simix_h = SIMIX_host_get_by_name(name);
+ if (simix_h == NULL) {
+ return NULL;
+ } else
+ return (m_host_t) simix_h->data;
}
/** \ingroup msg_easier_life
*
* Creates a new platform, including hosts, links and the
* routing_table.
- * \param file a filename of a description of a platform. This file is a simple text
- * file in which you can use C-style comments and C-style strings.
- * Here is a simple description of the format:
- \verbatim
-<CPU>
-host_name "power in MFlops" "availability" "availability file" ON/OFF "failure file"
-host_name "power in MFlops" "availability" "availability file" ON/OFF "failure file"
-...
-</LINKS>
-link_name "bandwidth in Mbytes" "bandwidth file" "latency in ms" "latency file"
-link_name "bandwidth in Mbytes" "bandwidth file" "latency in ms" "latency file"
-...
-ROUTES
-src_name dst_name (link_name link_name link_name ... )
-src_name dst_name (link_name link_name link_name ... )
-...
-\endverbatim
- * Have a look in the directory examples/msg/ to have a better idea of what
- * it looks like.
+ * \param file a filename of a xml description of a platform. This file
+ * follows this DTD :
+ *
+ * \include simgrid.dtd
+ *
+ * Here is a small example of such a platform
+ *
+ * \include small_platform.xml
+ *
+ * Have a look in the directory examples/msg/ to have a big example.
*/
-void MSG_create_environment(const char *file) {
- xbt_dict_cursor_t cursor = NULL;
- char *name = NULL;
- void *workstation = NULL;
+void MSG_create_environment(const char *file)
+{
+ xbt_dict_cursor_t c;
+ smx_host_t h;
+ char *name;
-/* surf_workstation_resource_init_CLM03(file); */
- surf_workstation_resource_init_KCCFLN05(file);
+ SIMIX_create_environment(file);
+ SIMIX_init();
- xbt_dict_foreach(workstation_set, cursor, name, workstation) {
- __MSG_host_create(name, workstation, NULL);
+ /* Initialize MSG hosts */
+ xbt_dict_foreach(SIMIX_host_get_dict(), c, name, h) {
+ __MSG_host_create(h, NULL);
}
-
return;
}
-
