From: mquinson Date: Tue, 30 Nov 2010 22:33:49 +0000 (+0000) Subject: definitely kill the Horrible Pimple X-Git-Tag: v3_5~43 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/430fae874db532fa9ddba26d0683bafe2754c1d0 definitely kill the Horrible Pimple git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8788 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/ChangeLog b/ChangeLog index 6f57f854dd..7444886ad7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,8 @@ SimGrid (3.5) unstable; urgency=low can wait on several of them simultaneously (as in waitany). * Fix the way to handle tokens in semaphores so that all access patterns work: {acquire, acquire_timeout, waitany} / {release, release_forever}. + * kill the dirty pimple SIMIX_message_sizes_output() + Please use (proper) visualization instead SIMDAG * Fix a bug in the management of tasks of size 0 in the surf network diff --git a/examples/msg/icomms/peer.c b/examples/msg/icomms/peer.c index ccf0ac425d..1d70c27b47 100644 --- a/examples/msg/icomms/peer.c +++ b/examples/msg/icomms/peer.c @@ -166,7 +166,6 @@ int main(int argc, char *argv[]) exit(1); } res = test_all(argv[1], argv[2]); - SIMIX_message_sizes_output("toto.txt"); MSG_clean(); if (res == MSG_OK) diff --git a/examples/msg/icomms/peer2.c b/examples/msg/icomms/peer2.c index d5d7c9566f..0d3fb0a4a0 100644 --- a/examples/msg/icomms/peer2.c +++ b/examples/msg/icomms/peer2.c @@ -126,7 +126,6 @@ int main(int argc, char *argv[]) exit(1); } res = test_all(argv[1], argv[2]); - SIMIX_message_sizes_output("toto.txt"); MSG_clean(); if (res == MSG_OK) diff --git a/examples/msg/icomms/peer3.c b/examples/msg/icomms/peer3.c index 93e933cf50..72a3eb38d4 100644 --- a/examples/msg/icomms/peer3.c +++ b/examples/msg/icomms/peer3.c @@ -164,7 +164,6 @@ int main(int argc, char *argv[]) exit(1); } res = test_all(argv[1], argv[2]); - SIMIX_message_sizes_output("toto.txt"); MSG_clean(); if (res == MSG_OK) diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c index 02ebcc5b5d..fdf0e488f9 100644 --- a/examples/msg/masterslave/masterslave_mailbox.c +++ b/examples/msg/masterslave/masterslave_mailbox.c @@ -131,7 +131,6 @@ int main(int argc, char *argv[]) exit(1); } res = test_all(argv[1], argv[2]); - SIMIX_message_sizes_output("toto.txt"); MSG_clean(); if (res == MSG_OK) diff --git a/include/xbt.h b/include/xbt.h index 21bdd49cd0..46c396a33b 100644 --- a/include/xbt.h +++ b/include/xbt.h @@ -31,7 +31,4 @@ #include #include -/* pimple to display the message sizes */ -XBT_PUBLIC(void) SIMIX_message_sizes_output(const char *filename); - #endif /* xbt_H */ diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index ab5a33f147..46b0594db0 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -482,23 +482,6 @@ void SIMIX_network_copy_data(smx_comm_t comm) } } -#include "xbt.h" -/* pimple to display the message sizes */ -void SIMIX_message_sizes_output(const char *filename) -{ - uintptr_t key = 0; - uintptr_t data = 0; - xbt_dict_cursor_t cursor; - FILE *out = NULL; - out = fopen(filename, "w"); - xbt_assert1(out, "Cannot open file %s", filename); - - xbt_dict_foreach(simix_global->msg_sizes, cursor, key, data) { - fprintf(out, "%zu %zu\n", key, data); - } - fclose(out); -} - /** * \brief Return the user data associated to the communication * \param comm The communication