/* 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. */
+/***
+ *** Options
+ ***/
+int gras_opt_trp_nomoredata_on_close=0;
+
#include "xbt/ex.h"
#include "xbt/peer.h"
#include "portable.h"
XBT_IN;
VERB1("Close %p",sock);
if (sock == _gras_lastly_selected_socket) {
+ xbt_assert0(!gras_opt_trp_nomoredata_on_close || !sock->moredata,
+ "Closing a socket having more data in buffer while the nomoredata_on_close option is activated");
+
if (sock->moredata)
- CRITICAL0("Closing a socket which had another message buffered after the one being handled now. Go fix your code.");
+ CRITICAL0("Closing a socket having more data in buffer. Option nomoredata_on_close disabled, so continuing.");
_gras_lastly_selected_socket=NULL;
}
*
* @param peer measurement socket to use for the experiment
* @param timeout timeout (in seconds)
- * @param exp_size total amount of data to send (in bytes).
* @param msg_size size of each chunk sent over the socket (in bytes).
+ * @param msg_amount how many of these packets you want to send.
*
* Calls to gras_socket_meas_send() and gras_socket_meas_recv() on
* each side of the socket should be paired.
* The exchanged data is zeroed to make sure it's initialized, but
* there is no way to control what is sent (ie, you cannot use these
* functions to exchange data out of band).
+ *
+ * @warning: in SimGrid version 3.1 and previous, the numerical arguments
+ * were the total amount of data to send and the msg_size. This
+ * was changed for the fool wanting to send more than MAXINT
+ * bytes in a fat pipe.
*/
void gras_socket_meas_send(gras_socket_t peer,
unsigned int timeout,
- unsigned long int exp_size,
- unsigned long int msg_size) {
+ unsigned long int msg_size,
+ unsigned long int msg_amount) {
char *chunk=NULL;
- unsigned long int exp_sofar;
-
+ unsigned long int sent_sofar;
+
XBT_IN;
if (gras_if_RL())
xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket");
xbt_assert0(peer->outgoing,"Socket not suited for data send (was created with gras_socket_server(), not gras_socket_client())");
- for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
- CDEBUG5(gras_trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
- exp_sofar,exp_size,msg_size,
+ for (sent_sofar=0; sent_sofar < msg_amount; sent_sofar++) {
+ CDEBUG5(gras_trp_meas,"Sent %lu msgs of %lu (size of each: %ld) to %s:%d",
+ sent_sofar,msg_amount,msg_size,
gras_socket_peer_name(peer), gras_socket_peer_port(peer));
(*peer->plugin->raw_send)(peer,chunk,msg_size);
}
- CDEBUG5(gras_trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
- exp_sofar,exp_size,msg_size,
+ CDEBUG5(gras_trp_meas,"Sent %lu msgs of %lu (size of each: %ld) to %s:%d",
+ sent_sofar,msg_amount,msg_size,
gras_socket_peer_name(peer), gras_socket_peer_port(peer));
if (gras_if_RL())
*
* Calls to gras_socket_meas_send() and gras_socket_meas_recv() on
* each side of the socket should be paired.
+ *
+ * @warning: in SimGrid version 3.1 and previous, the numerical arguments
+ * were the total amount of data to send and the msg_size. This
+ * was changed for the fool wanting to send more than MAXINT
+ * bytes in a fat pipe.
*/
void gras_socket_meas_recv(gras_socket_t peer,
unsigned int timeout,
- unsigned long int exp_size,
- unsigned long int msg_size){
+ unsigned long int msg_size,
+ unsigned long int msg_amount){
char *chunk=NULL;
- unsigned long int exp_sofar;
+ unsigned long int got_sofar;
XBT_IN;
"Asked to receive measurement data on a regular socket");
xbt_assert0(peer->incoming,"Socket not suited for data receive");
- for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
- CDEBUG5(gras_trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d",
- exp_sofar,exp_size,msg_size,
+ for (got_sofar=0; got_sofar < msg_amount; got_sofar ++) {
+ CDEBUG5(gras_trp_meas,"Recvd %ld msgs of %lu (size of each: %ld) from %s:%d",
+ got_sofar,msg_amount,msg_size,
gras_socket_peer_name(peer), gras_socket_peer_port(peer));
(peer->plugin->raw_recv)(peer,chunk,msg_size);
}
- CDEBUG5(gras_trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d",
- exp_sofar,exp_size,msg_size,
+ CDEBUG5(gras_trp_meas,"Recvd %ld msgs of %lu (size of each: %ld) from %s:%d",
+ got_sofar,msg_amount,msg_size,
gras_socket_peer_name(peer), gras_socket_peer_port(peer));
if (gras_if_RL())