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
Start the SimDag revolution: function renaming
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
basic_link_test.c
diff --git
a/teshsuite/simdag/platforms/basic_link_test.c
b/teshsuite/simdag/platforms/basic_link_test.c
index
5b0cfc6
..
2493e63
100644
(file)
--- a/
teshsuite/simdag/platforms/basic_link_test.c
+++ b/
teshsuite/simdag/platforms/basic_link_test.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-2010, 2012. The SimGrid Team.
+/* Copyright (c) 2008-2010, 2012
-2015
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-6,13
+6,18
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
-#include "surf/surf_private.h"
+#include "simgrid/simdag.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic_link_test, sd,
"SimDag test basic_link_test");
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic_link_test, sd,
"SimDag test basic_link_test");
+static int cmp_link(const void*a, const void*b) {
+ const char *nameA = SD_link_get_name(*(SD_link_t*)a);
+ const char *nameB = SD_link_get_name(*(SD_link_t*)b);
+ return strcmp( nameA, nameB );
+}
+
int main(int argc, char **argv)
{
int i;
int main(int argc, char **argv)
{
int i;
@@
-24,13
+29,16
@@
int main(int argc, char **argv)
/* creation of the environment */
SD_create_environment(argv[1]);
/* creation of the environment */
SD_create_environment(argv[1]);
- XBT_INFO("Link number: %d", SD_link_get_number());
links = SD_link_get_list();
links = SD_link_get_list();
- for(i=0; i<SD_link_get_number();i++){
+ int count = SD_link_get_count();
+ XBT_INFO("Link count: %d", count);
+ qsort((void *)links, count, sizeof(SD_link_t), cmp_link);
+
+ for(i=0; i < count; i++){
XBT_INFO("%s: latency = %.5f, bandwidth = %f",
SD_link_get_name(links[i]),
XBT_INFO("%s: latency = %.5f, bandwidth = %f",
SD_link_get_name(links[i]),
- SD_link_get_
current_
latency(links[i]),
- SD_link_get_
current_
bandwidth(links[i]));
+ SD_link_get_latency(links[i]),
+ SD_link_get_bandwidth(links[i]));
SD_link_set_data(links[i], (void*) user_data);
if(strcmp(user_data, (const char*)SD_link_get_data(links[i]))){
XBT_ERROR("User data was corrupted.");
SD_link_set_data(links[i], (void*) user_data);
if(strcmp(user_data, (const char*)SD_link_get_data(links[i]))){
XBT_ERROR("User data was corrupted.");