Skip to content

Virtual clients #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Virtual clients #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
537f2ac
Option to set number of bits (default 0) for the number or virtual cl…
inkdot7 Feb 9, 2023
88d6c0f
Insert virtual index in the local_id (transmit timestamp), to have mo…
inkdot7 Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 49 additions & 6 deletions perf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ struct config {
uint32_t dst_address;
uint32_t src_network;
int src_bits;
int vclient_bits;
int ptp_domain;
int ptp_mcast;
int min_rate;
Expand Down Expand Up @@ -201,12 +202,24 @@ static struct timespec convert_ptp_ts(uint16_t hi, uint32_t mid, uint32_t lo) {

static void make_request(struct sender_request *request, struct client *client, int index,
struct config *config, struct timespec *when) {
int vclient_index;

request->when = *when;
request->src_address = config->src_network ^ (index % (1U << (32 - config->src_bits)));
request->_pad = 0;
request->remote_id = client->remote_id;
request->local_id = (uint64_t)random() << 32 | random();

request->local_id = (request->local_id & ~((2 << config->vclient_bits) - 2));
vclient_index = index >> (32 - config->src_bits);
/* Lowest bit used for interleave: */
request->local_id |= vclient_index << 1;
/*
printf ("make idx %d = v%d:%d => %016" PRIx64 "\n",
index,
vclient_index,
index & ((1 << (32 - config->src_bits)) - 1),
request->local_id);
*/
client->local_id = request->local_id;
}

Expand All @@ -216,7 +229,8 @@ static bool process_response(struct pcap_pkthdr *header, const u_char *data, str
struct timespec local_rx = { .tv_sec = header->ts.tv_sec, .tv_nsec = header->ts.tv_usec };
struct timespec prev_local_rx, prev_remote_rx, remote_rx = {0}, remote_tx = {0};
int src_port, dst_port, ptp_type = 0;
uint32_t dst_address;
uint32_t dst_address, client_index;
uint64_t remote_vclient_index;
bool valid;
double offset;

Expand Down Expand Up @@ -245,10 +259,34 @@ static bool process_response(struct pcap_pkthdr *header, const u_char *data, str
dst_address = ntohl(*(uint32_t *)(data + 44));
}

switch (config->mode) {
case NTP_BASIC:
case NTP_INTERLEAVED:
remote_vclient_index = ((*(uint64_t *)(data + 24)) >> 1) &
((1U << config->vclient_bits) - 1);
break;
case PTP_DELAY:
case PTP_NSM:
remote_vclient_index = ((*(uint16_t *)(data + 30)) >> 1) &
((1U << config->vclient_bits) - 1);
break;
default:
assert(0);
}

if ((dst_address ^ config->src_network) >> (32 - config->src_bits))
return false;

client = &clients[(dst_address ^ config->src_network) % (uint32_t)num_clients];
client_index = ((dst_address ^ config->src_network) +
(remote_vclient_index << (32 - config->src_bits))) % (uint32_t)num_clients;
/*
printf ("recv %016" PRIx64 " => v%d:%d = idx %d\n",
*(uint64_t *)(data + 24),
(uint32_t) remote_vclient_index,
(dst_address ^ config->src_network),
client_index);
*/
client = &clients[client_index];
prev_remote_rx = client->remote_rx;
prev_local_rx = client->local_rx;

Expand Down Expand Up @@ -405,9 +443,9 @@ static bool measure_perf(struct config *config, pcap_t *pcap, int *senders, int
num_clients = 1;
if (num_clients > MAX_CLIENTS)
num_clients = MAX_CLIENTS;
if (num_clients > 1U << (32 - config->src_bits)) {
if (num_clients > 1U << (32 - config->src_bits) << config->vclient_bits) {
fprintf(stderr, "Warning: source network might be too small for rate %d\n", rate);
num_clients = 1U << (32 - config->src_bits);
num_clients = 1U << (32 - config->src_bits) << config->vclient_bits;
}

assert(num_clients > 0 && num_clients <= MAX_CLIENTS);
Expand Down Expand Up @@ -608,8 +646,9 @@ int main(int argc, char **argv) {
config.senders = 1;
config.multiplier = 1.5;
config.sampling_interval = 2.0;
config.vclient_bits = 0;

while ((opt = getopt(argc, argv, "BID:N:i:s:d:m:Mr:p:elt:x:o:OHS:h")) != -1) {
while ((opt = getopt(argc, argv, "BID:N:i:s:d:m:Mk:r:p:elt:x:o:OHS:h")) != -1) {
switch (opt) {
case 'B':
config.mode = NTP_BASIC;
Expand Down Expand Up @@ -653,6 +692,9 @@ int main(int argc, char **argv) {
case 'M':
config.ptp_mcast = 1;
break;
case 'k':
config.vclient_bits = atoi(optarg);
break;
case 'r':
if ((s = strchr(optarg, '-'))) {
*s = '\0';
Expand Down Expand Up @@ -728,6 +770,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "\t-m MAC specify destination MAC address\n");
fprintf(stderr, "\nOther options:\n");
fprintf(stderr, "\t-M send multicast PTP delay requests\n");
fprintf(stderr, "\t-k BITS specify number of virtual client bits per IP\n");
fprintf(stderr, "\t-r RATE[-RATE] specify minimum and maximum rate (1000-1000000)\n");
fprintf(stderr, "\t-p NUMBER specify number of processes to send requests (1)\n");
fprintf(stderr, "\t-e make transmit interval exponentially distributed\n");
Expand Down