Commit a762cc3d authored by Misbah Mubarak's avatar Misbah Mubarak

making payload_sz configurable for df-plus and df-dally synthetic workloads

parent 3aee6f04
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
#include "codes/configuration.h" #include "codes/configuration.h"
#include "codes/lp-type-lookup.h" #include "codes/lp-type-lookup.h"
#define PAYLOAD_SZ 2048
static int net_id = 0; static int net_id = 0;
static int traffic = 1; static int traffic = 1;
static double arrival_time = 1000.0; static double arrival_time = 1000.0;
static int PAYLOAD_SZ = 2048;
/* whether to pull instead of push */ /* whether to pull instead of push */
static int num_servers_per_rep = 0; static int num_servers_per_rep = 0;
...@@ -116,6 +116,7 @@ const tw_optdef app_opt [] = ...@@ -116,6 +116,7 @@ const tw_optdef app_opt [] =
TWOPT_GROUP("Model net synthetic traffic " ), TWOPT_GROUP("Model net synthetic traffic " ),
TWOPT_UINT("traffic", traffic, "UNIFORM RANDOM=1, NEAREST NEIGHBOR=2 "), TWOPT_UINT("traffic", traffic, "UNIFORM RANDOM=1, NEAREST NEIGHBOR=2 "),
TWOPT_UINT("num_messages", num_msgs, "Number of messages to be generated per terminal "), TWOPT_UINT("num_messages", num_msgs, "Number of messages to be generated per terminal "),
TWOPT_UINT("payload_sz",PAYLOAD_SZ, "size of the message being sent "),
TWOPT_STIME("sampling-interval", sampling_interval, "the sampling interval "), TWOPT_STIME("sampling-interval", sampling_interval, "the sampling interval "),
TWOPT_STIME("sampling-end-time", sampling_end_time, "sampling end time "), TWOPT_STIME("sampling-end-time", sampling_end_time, "sampling end time "),
TWOPT_STIME("arrival_time", arrival_time, "INTER-ARRIVAL TIME"), TWOPT_STIME("arrival_time", arrival_time, "INTER-ARRIVAL TIME"),
...@@ -181,6 +182,11 @@ static void handle_kickoff_rev_event( ...@@ -181,6 +182,11 @@ static void handle_kickoff_rev_event(
if(b->c8) if(b->c8)
tw_rand_reverse_unif(lp->rng); tw_rand_reverse_unif(lp->rng);
if(traffic == RANDOM_OTHER_GROUP) {
tw_rand_reverse_unif(lp->rng);
tw_rand_reverse_unif(lp->rng);
}
model_net_event_rc2(lp, &m->event_rc); model_net_event_rc2(lp, &m->event_rc);
ns->msg_sent_count--; ns->msg_sent_count--;
tw_rand_reverse_unif(lp->rng); tw_rand_reverse_unif(lp->rng);
...@@ -340,8 +346,8 @@ static void svr_finalize( ...@@ -340,8 +346,8 @@ static void svr_finalize(
{ {
ns->end_ts = tw_now(lp); ns->end_ts = tw_now(lp);
printf("server %llu recvd %d bytes in %f seconds, %f MiB/s sent_count %d recvd_count %d local_count %d \n", (unsigned long long)lp->gid, PAYLOAD_SZ*ns->msg_recvd_count, ns_to_s(ns->end_ts-ns->start_ts), //printf("server %llu recvd %d bytes in %f seconds, %f MiB/s sent_count %d recvd_count %d local_count %d \n", (unsigned long long)lp->gid, PAYLOAD_SZ*ns->msg_recvd_count, ns_to_s(ns->end_ts-ns->start_ts),
((double)(PAYLOAD_SZ*ns->msg_sent_count)/(double)(1024*1024)/ns_to_s(ns->end_ts-ns->start_ts)), ns->msg_sent_count, ns->msg_recvd_count, ns->local_recvd_count); // ((double)(PAYLOAD_SZ*ns->msg_sent_count)/(double)(1024*1024)/ns_to_s(ns->end_ts-ns->start_ts)), ns->msg_sent_count, ns->msg_recvd_count, ns->local_recvd_count);
return; return;
} }
......
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
#include "codes/configuration.h" #include "codes/configuration.h"
#include "codes/lp-type-lookup.h" #include "codes/lp-type-lookup.h"
#define PAYLOAD_SZ 2048
static int net_id = 0; static int net_id = 0;
static int traffic = 1; static int traffic = 1;
static int PAYLOAD_SZ = 2048;
static double arrival_time = 1000.0; static double arrival_time = 1000.0;
/* whether to pull instead of push */ /* whether to pull instead of push */
...@@ -114,6 +114,7 @@ const tw_optdef app_opt [] = ...@@ -114,6 +114,7 @@ const tw_optdef app_opt [] =
{ {
TWOPT_GROUP("Model net synthetic traffic " ), TWOPT_GROUP("Model net synthetic traffic " ),
TWOPT_UINT("traffic", traffic, "UNIFORM RANDOM=1, NEAREST NEIGHBOR=2 "), TWOPT_UINT("traffic", traffic, "UNIFORM RANDOM=1, NEAREST NEIGHBOR=2 "),
TWOPT_UINT("payload_sz",PAYLOAD_SZ, "size of the message being sent "),
TWOPT_UINT("num_messages", num_msgs, "Number of messages to be generated per terminal "), TWOPT_UINT("num_messages", num_msgs, "Number of messages to be generated per terminal "),
TWOPT_STIME("sampling-interval", sampling_interval, "the sampling interval "), TWOPT_STIME("sampling-interval", sampling_interval, "the sampling interval "),
TWOPT_STIME("sampling-end-time", sampling_end_time, "sampling end time "), TWOPT_STIME("sampling-end-time", sampling_end_time, "sampling end time "),
...@@ -350,8 +351,8 @@ static void svr_finalize( ...@@ -350,8 +351,8 @@ static void svr_finalize(
{ {
ns->end_ts = tw_now(lp); ns->end_ts = tw_now(lp);
printf("server %llu recvd %d bytes in %f seconds, %f MiB/s sent_count %d recvd_count %d local_count %d \n", (unsigned long long)lp->gid, PAYLOAD_SZ*ns->msg_recvd_count, ns_to_s(ns->end_ts-ns->start_ts), // printf("server %llu recvd %d bytes in %f seconds, %f MiB/s sent_count %d recvd_count %d local_count %d \n", (unsigned long long)lp->gid, PAYLOAD_SZ*ns->msg_recvd_count, ns_to_s(ns->end_ts-ns->start_ts),
((double)(PAYLOAD_SZ*ns->msg_sent_count)/(double)(1024*1024)/ns_to_s(ns->end_ts-ns->start_ts)), ns->msg_sent_count, ns->msg_recvd_count, ns->local_recvd_count); // ((double)(PAYLOAD_SZ*ns->msg_sent_count)/(double)(1024*1024)/ns_to_s(ns->end_ts-ns->start_ts)), ns->msg_sent_count, ns->msg_recvd_count, ns->local_recvd_count);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment