From 68d4ecc3661057a68131b4e49f5e614ac53f721b Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Tue, 19 Oct 2010 14:53:14 +0300 Subject: [PATCH] test-socket-signal: fix data size macros/usage --- Utils/test-socket-signal/client.c | 15 +++++++-------- Utils/test-socket-signal/server.c | 13 ++++++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Utils/test-socket-signal/client.c b/Utils/test-socket-signal/client.c index 6cfe726..7b7e45a 100644 --- a/Utils/test-socket-signal/client.c +++ b/Utils/test-socket-signal/client.c @@ -18,15 +18,16 @@ #define DEFAULT_SERVER_LISTEN_PORT 43210 #define DEFAULT_SERVER_HOST "localhost" -#define DATA_SIZE 120 +#define PACKET_PAYLOAD_SIZE 120 #define PACKET_INDEX_SIZE sizeof(unsigned long long) #define PACKET_TIMESPEC_SIZE sizeof(time_t) +#define PACKET_SIZE (PACKET_PAYLOAD_SIZE + PACKET_INDEX_SIZE + PACKET_TIMESPEC_SIZE) #define TIMER_FREQUENCY_SECS 1 #define CLOCKID CLOCK_REALTIME #define SIG SIGRTMIN -static char data[DATA_SIZE + PACKET_INDEX_SIZE + PACKET_TIMESPEC_SIZE]; +static char data[PACKET_SIZE]; /* connection socket */ static int connectfd; @@ -37,7 +38,7 @@ static void init_buffer(void) srand(time(NULL)); - for (i = 0; i < DATA_SIZE-1; i++) + for (i = 0; i < PACKET_PAYLOAD_SIZE-2; i++) data[i] = (char) (rand() % 26) + 'a'; data[i] = '\0'; } @@ -55,17 +56,18 @@ static void fill_buffer(void) curr_time_secs = time(NULL); - ptr = data + DATA_SIZE; + ptr = data + PACKET_PAYLOAD_SIZE; * (unsigned long long *) ptr = index; ptr += PACKET_INDEX_SIZE; * (time_t *) ptr = curr_time_secs; index++; + printf("curr_time_secs: %lu, index: %llu\n", curr_time_secs, index); } static ssize_t send_buffer(int sockfd) { - return send(sockfd, data, DATA_SIZE, 0); + return send(sockfd, data, PACKET_SIZE, 0); } static void timer_handler(int sig, siginfo_t *si, void *uc) @@ -94,7 +96,6 @@ static void schedule_timer(void) DIE(rc < 0, "sigaction"); /* Block timer signal temporarily */ - printf("Blocking signal %d\n", SIG); sigemptyset(&mask); sigaddset(&mask, SIG); rc = sigprocmask(SIG_SETMASK, &mask, NULL); @@ -137,8 +138,6 @@ int main(void) sigsuspend(&mask); } - printf("\n--- data sent!\n"); - close(connectfd); return 0; diff --git a/Utils/test-socket-signal/server.c b/Utils/test-socket-signal/server.c index 7c8bda7..b2cd28f 100644 --- a/Utils/test-socket-signal/server.c +++ b/Utils/test-socket-signal/server.c @@ -19,16 +19,16 @@ #define DEFAULT_SERVER_LISTEN_PORT 43210 #define SERVER_BACKLOG 5 -#define DATA_SIZE 120 +#define PACKET_PAYLOAD_SIZE 120 #define PACKET_INDEX_SIZE sizeof(unsigned long long) #define PACKET_TIMESPEC_SIZE sizeof(time_t) +#define PACKET_SIZE (PACKET_PAYLOAD_SIZE + PACKET_INDEX_SIZE + PACKET_TIMESPEC_SIZE) - -static char data[DATA_SIZE]; +static char data[PACKET_SIZE]; static ssize_t receive_buffer(int sockfd) { - return recv(sockfd, data, DATA_SIZE, 0); + return recv(sockfd, data, PACKET_SIZE, 0); } static void print_buffer(void) @@ -45,11 +45,14 @@ static void print_buffer_meta(void) curr_time_secs = time(NULL); - ptr = data + DATA_SIZE; + ptr = data + PACKET_PAYLOAD_SIZE; index = * (unsigned long long *) ptr; ptr += PACKET_INDEX_SIZE; sender_time_secs = * (time_t *) ptr; + printf("curr_time_secs: %lu, sender_time_secs: %lu\n", + curr_time_secs, sender_time_secs); + printf("received packet index %llu, ", index); if (sender_time_secs > curr_time_secs) printf("negative latency (weird)\n"); -- 2.20.1