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
take care of new dll import and dll export in Windows
[simgrid.git]
/
testsuite
/
gras
/
trp_tcp_client.c
diff --git
a/testsuite/gras/trp_tcp_client.c
b/testsuite/gras/trp_tcp_client.c
index
a62dbd6
..
55aa602
100644
(file)
--- a/
testsuite/gras/trp_tcp_client.c
+++ b/
testsuite/gras/trp_tcp_client.c
@@
-2,41
+2,44
@@
/* trp_tcp_client: Client of a test case for the tcp transport. */
/* trp_tcp_client: Client of a test case for the tcp transport. */
-/* Authors: Martin Quinson */
-/* Copyright (C) 2003 the OURAGAN project. */
+/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
#include <stdio.h>
#include <stdio.h>
-#include
<gras.h>
+#include
"gras.h"
#include "gras/Transport/transport_interface.h"
#include "gras/Transport/transport_interface.h"
-
//GRAS_LOG_NEW_DEFAULT_CATEGORY(test
);
+
XBT_LOG_NEW_CATEGORY(test,"Logging for this test"
);
int main(int argc,char *argv[]) {
int main(int argc,char *argv[]) {
- gras_socket_t * sock;
- gras_error_t errcode;
+ gras_socket_t sock;
char data_send[256];
char data_recv[256];
memset(data_send, 0, sizeof(data_send));
memset(data_recv, 0, sizeof(data_recv));
char data_send[256];
char data_recv[256];
memset(data_send, 0, sizeof(data_send));
memset(data_recv, 0, sizeof(data_recv));
- gras_init
_defaultlog(&argc,argv,"trp.thresh=debug"
);
+ gras_init
(&argc,argv
);
fprintf(stderr,"===[CLIENT]=== Contact the server\n");
fprintf(stderr,"===[CLIENT]=== Contact the server\n");
-
TRYFAIL(gras_socket_client(NULL,55555,&sock)
);
+
sock = gras_socket_client(NULL,55555
);
sprintf(data_send,"Hello, I am a little test data to send.");
fprintf(stderr,"===[CLIENT]=== Send data\n");
sprintf(data_send,"Hello, I am a little test data to send.");
fprintf(stderr,"===[CLIENT]=== Send data\n");
- TRYFAIL(gras_trp_chunk_send(sock,data_send, sizeof(data_send)));
+ gras_trp_send(sock,data_send, sizeof(data_send),1);
+ gras_trp_flush(sock);
fprintf(stderr,"===[CLIENT]=== Waiting for the ACK\n");
fprintf(stderr,"===[CLIENT]=== Waiting for the ACK\n");
-
TRYFAIL(gras_trp_chunk_recv(sock,data_recv, sizeof(data_recv)
));
+
gras_trp_recv(sock,data_recv, sizeof(data_recv
));
if (strcmp(data_send, data_recv)) {
fprintf(stderr, "===[CLIENT]=== String sent != string received\n");
if (strcmp(data_send, data_recv)) {
fprintf(stderr, "===[CLIENT]=== String sent != string received\n");
-
gras
_abort();
+
xbt
_abort();
}
fprintf(stderr,"===[CLIENT]=== Got a valid ACK\n");
}
fprintf(stderr,"===[CLIENT]=== Got a valid ACK\n");