Commit 1fa687f4 authored by Andreas Schmidt's avatar Andreas Schmidt

Enable pacing by default.

parent 6002448a
......@@ -286,7 +286,7 @@ void PrrtReceiver_add_outstanding_packet_state(PrrtReceiver *recv, PrrtPacket *p
} else if (PrrtPacket_type(packet) == PACKET_TYPE_REDUNDANCY) {
packetStore = recv->redundancyInflightPacketStore;
} else return;
//printf("Adding Packet #%u to %u\n", packet->sequenceNumber, PrrtPacket_type(packet));
check(pthread_mutex_lock(&recv->lock) == 0, "Lock failed.");
if (recv->packetTracking->pipe == 0) {
......
......@@ -59,7 +59,7 @@ PrrtSocket *PrrtSocket_create(const bool is_sender, prrtTimedelta_t target_delay
check_mem(s);
s->nextSendTime = 0;
s->pacingEnabled = false;
s->pacingEnabled = true;
s->isSender = is_sender;
s->isHardwareTimestamping = false;
......@@ -133,11 +133,6 @@ bool PrrtSocket_enable_thread_pinning(PrrtSocket *s) {
return false;
}
bool PrrtSocket_enable_pacing(PrrtSocket *s) {
s->pacingEnabled = true;
return true;
}
bool PrrtSocket_enable_hardware_timestamping(PrrtSocket *s, const char * interface_name) {
check(s->isBound == false, "Hardware timestamping can only be enabled before calling PrrtSocket_bind()");
......
......@@ -95,7 +95,6 @@ PrrtSocket *PrrtSocket_create(bool is_sender, prrtTimedelta_t target_delay_us);
bool PrrtSocket_enable_hardware_timestamping(PrrtSocket *s, const char * interface_name);
bool PrrtSocket_enable_thread_pinning(PrrtSocket *s);
bool PrrtSocket_enable_pacing(PrrtSocket *s);
bool PrrtSocket_bind(PrrtSocket *s, const char *ipAddress, const uint16_t port);
......
......@@ -113,10 +113,6 @@ static inline socket_t _open_sender(struct arguments *args) {
PrrtSocket_enable_thread_pinning(s);
}
if(args->pacing) {
PrrtSocket_enable_pacing(s);
}
assert(PrrtSocket_bind(s, "0.0.0.0", args->local_port) && "bind failed");
PrrtSocket_connect(s, args->target, args->port);
......
......@@ -25,7 +25,6 @@ struct arguments {
char *outfile;
char *target;
bool thread_pinning;
bool pacing;
};
#include "time-protocol.h"
......
......@@ -16,7 +16,6 @@ static struct argp_option options[] = {
{"size", 's', "SIZE", 0, "Size" },
{"output", 'o', "FILE", 0, "Output to FILE instead of standard output" },
{"threadpinning", 'T', 0, 0, "Enable thread pinning"},
{"pacing", 'P', 0, 0, "Enable pacing"},
{ 0 }
};
......@@ -29,7 +28,6 @@ struct arguments
uint16_t size;
char* outfile;
bool thread_pinning;
bool pacing;
};
static char args_doc[] = "";
......@@ -50,9 +48,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
case 's':
arguments->size = (uint16_t) strtol(arg, &pEnd, 10);
break;
case 'P':
arguments->pacing = true;
break;
case 'l':
arguments->local_port = (uint16_t) strtol(arg, &pEnd, 10);
break;
......@@ -85,7 +80,6 @@ int main(int argc, char **argv) {
.local_port = 6000,
.size = 1500,
.rounds = 127,
.pacing = false,
.outfile = "-",
.thread_pinning = false,
};
......
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