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
increase matrix size a bit, and do not wait insane amount of time on simulator now...
[simgrid.git]
/
examples
/
gras
/
pmm
/
pmm.c
diff --git
a/examples/gras/pmm/pmm.c
b/examples/gras/pmm/pmm.c
index
19b4d6d
..
7d20b7c
100755
(executable)
--- a/
examples/gras/pmm/pmm.c
+++ b/
examples/gras/pmm/pmm.c
@@
-16,7
+16,7
@@
#define NEIGHBOR_COUNT PROC_MATRIX_SIZE - 1
#define SLAVE_COUNT (PROC_MATRIX_SIZE*PROC_MATRIX_SIZE)
#define NEIGHBOR_COUNT PROC_MATRIX_SIZE - 1
#define SLAVE_COUNT (PROC_MATRIX_SIZE*PROC_MATRIX_SIZE)
-#define DATA_MATRIX_SIZE
9
+#define DATA_MATRIX_SIZE
18
const int submatrix_size = DATA_MATRIX_SIZE/PROC_MATRIX_SIZE;
XBT_LOG_NEW_DEFAULT_CATEGORY(pmm,"Parallel Matrix Multiplication");
const int submatrix_size = DATA_MATRIX_SIZE/PROC_MATRIX_SIZE;
XBT_LOG_NEW_DEFAULT_CATEGORY(pmm,"Parallel Matrix Multiplication");
@@
-101,10
+101,13
@@
int master (int argc,char *argv[]) {
C = xbt_matrix_double_new_zeros(DATA_MATRIX_SIZE,DATA_MATRIX_SIZE);
/* Create the connexions */
C = xbt_matrix_double_new_zeros(DATA_MATRIX_SIZE,DATA_MATRIX_SIZE);
/* Create the connexions */
+ xbt_assert0(argc>1, "Usage: master <port>");
gras_socket_server(atoi(argv[1]));
peers=amok_pm_group_new("pmm");
gras_socket_server(atoi(argv[1]));
peers=amok_pm_group_new("pmm");
- INFO0("Wait for peers for 10 sec");
- gras_msg_handleall(10); /* friends, we're ready. Come and play */
+
+ /* friends, we're ready. Come and play */
+ INFO0("Wait for peers for 5 sec");
+ gras_msg_handleall(5);
INFO1("Got %ld pals",xbt_dynar_length(peers));
for (i=0;
INFO1("Got %ld pals",xbt_dynar_length(peers));
for (i=0;
@@
-112,6
+115,7
@@
int master (int argc,char *argv[]) {
i++) {
xbt_dynar_get_cpy(peers,i,&grid[i]);
i++) {
xbt_dynar_get_cpy(peers,i,&grid[i]);
+ INFO2("Connecting to %s:%d.",grid[i]->name,grid[i]->port);
socket[i]=gras_socket_client(grid[i]->name,grid[i]->port);
INFO2("Connected to %s:%d.",grid[i]->name,grid[i]->port);
}
socket[i]=gras_socket_client(grid[i]->name,grid[i]->port);
INFO2("Connected to %s:%d.",grid[i]->name,grid[i]->port);
}
@@
-123,7
+127,8
@@
int master (int argc,char *argv[]) {
for (i=SLAVE_COUNT; i<xbt_dynar_length(peers); ) {
xbt_peer_t h;
for (i=SLAVE_COUNT; i<xbt_dynar_length(peers); ) {
xbt_peer_t h;
- xbt_dynar_get_cpy(peers,i,&h);
+ xbt_dynar_remove_at(peers,i,&h);
+ INFO2("Too much slaves. Killing %s:%d", h->name, h->port);
amok_pm_kill_hp(h->name,h->port);
free(h);
}
amok_pm_kill_hp(h->name,h->port);
free(h);
}
@@
-365,8
+370,8
@@
int slave(int argc,char *argv[]) {
/* Create the connexions */
mysock = gras_socket_server_range(3000,9999,0,0);
/* Create the connexions */
mysock = gras_socket_server_range(3000,9999,0,0);
+ gras_os_sleep(1); /* let the master get ready */
INFO1("Sensor starting (on port %d)",gras_os_myport());
INFO1("Sensor starting (on port %d)",gras_os_myport());
- gras_os_sleep(2); /* let the master get ready */
master = gras_socket_client_from_string(argv[1]);
/* Join and run the group */
master = gras_socket_client_from_string(argv[1]);
/* Join and run the group */