A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
examples
/
msg
/
masterslave
/
masterslave_platfgen.c
diff --git
a/examples/msg/masterslave/masterslave_platfgen.c
b/examples/msg/masterslave/masterslave_platfgen.c
index
e26fb1d
..
134fae7
100644
(file)
--- a/
examples/msg/masterslave/masterslave_platfgen.c
+++ b/
examples/msg/masterslave/masterslave_platfgen.c
@@
-1,7
+1,12
@@
+/* Copyright (c) 2012-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. */
#include "simgrid/platf_generator.h"
#include "xbt.h"
#include "simgrid/platf_generator.h"
#include "xbt.h"
-#include "
msg
/msg.h"
+#include "
simgrid
/msg.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(test_generation,
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(test_generation,
@@
-15,7
+20,6
@@
void labeler_1(context_edge_t edge);
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
-
/** Promoter function
* Just promote each node into a host, with fixed power
*/
/** Promoter function
* Just promote each node into a host, with fixed power
*/
@@
-24,8
+28,8
@@
void promoter_1(context_node_t node) {
s_sg_platf_host_cbarg_t host_parameters;
host_parameters.id = NULL;
s_sg_platf_host_cbarg_t host_parameters;
host_parameters.id = NULL;
- host_parameters.power_peak =
1000000
;
-
+ host_parameters.power_peak =
xbt_dynar_new(sizeof(double), NULL)
;
+ xbt_dynar_push_as(host_parameters.power_peak, double, 1000000.0);
host_parameters.core_amount = 1;
host_parameters.power_scale = 1;
host_parameters.power_trace = NULL;
host_parameters.core_amount = 1;
host_parameters.power_scale = 1;
host_parameters.power_trace = NULL;
@@
-211,7
+215,7
@@
int main(int argc, char **argv) {
msg_host_t host = NULL;
msg_host_t host_master = NULL;
xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
msg_host_t host = NULL;
msg_host_t host_master = NULL;
xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
- char** hostname_list = malloc(sizeof(char*) * xbt_dynar_length(host_dynar));
+ char** hostname_list =
xbt_
malloc(sizeof(char*) * xbt_dynar_length(host_dynar));
xbt_dynar_foreach(host_dynar, i, host) {
MSG_process_create("slave", slave, NULL, host);
xbt_dynar_foreach(host_dynar, i, host) {
MSG_process_create("slave", slave, NULL, host);