| Message ID | 1396061790-26705-2-git-send-email-santosh.shukla@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On 29 March 2014 03:56, Santosh Shukla <santosh.shukla@linaro.org> wrote: > From: santosh shukla <santosh.shukla@linaro.org> > > Application open PF_INET socket, spawns two thread, > one is sender_ping_thr another one listen_thr. > Each send request arms timer for absolute timeout duration > Whenever listner thread recieves ack, it cancels the timer_out > and free the timeout buffer i.e. tmo_buf allocate while arming.. > Otherwise timeout-event-notfier will enqueue time out even to > queue for that pckt_cnt. > > Signed-off-by: santosh shukla <santosh.shukla@linaro.org> > --- > V2 change : > - incorporated style comment in patch > - odp queue based socket api need more changes specific > to flag setting like socket flag, socket type, parameterising setsockopt > this program need flags i.e..SOL_IP, IP_TTL etc,, > At this point my initial effort says it will take little more time > to get other parameter support in pktio socket param in odp > therefore I suggest that this could be todo and seubsequent patch > to include qeueue-base-socket method as and when I manage solve > socket parameter problem for this application. > > V3 change : > - Removed git am -3 <patch> warning. > This is not the solution, you need to remove the trailing newline in: test/api_test/odp_timer_ping.c Cheers, Anders > > test/api_test/Makefile | 16 +- > test/api_test/odp_common.h | 1 + > test/api_test/odp_timer_ping.c | 335 > ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 350 insertions(+), 2 deletions(-) > create mode 100644 test/api_test/odp_timer_ping.c > > diff --git a/test/api_test/Makefile b/test/api_test/Makefile > index bd99c50..0398cd2 100644 > --- a/test/api_test/Makefile > +++ b/test/api_test/Makefile > @@ -11,6 +11,7 @@ ODP_ROOT = ../.. > ODP_ATOMIC = odp_atomic > ODP_SHM = odp_shm > ODP_RING = odp_ring > +ODP_TIM = odp_timer > > include $(ODP_ROOT)/Makefile.inc > include ../Makefile.inc > @@ -32,13 +33,18 @@ RING_OBJS = > RING_OBJS += $(OBJ_DIR)/odp_common.o > RING_OBJS += $(OBJ_DIR)/odp_ring_test.o > > -DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) > +TIM_OBJS = > +TIM_OBJS += $(OBJ_DIR)/odp_common.o > +TIM_OBJS += $(OBJ_DIR)/odp_timer_ping.o > + > +DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) > $(TIM_OBJS:.o=.d) > > .PHONY: all > -all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) > +all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) $(ODP_TIM) > atomic: $(OBJ_DIR) $(ODP_ATOMIC) > shm: $(OBJ_DIR) $(ODP_SHM) > ring: $(OBJ_DIR) $(ODP_RING) > +timer: $(OBJ_DIR) $(ODP_TIM) > > -include $(DEPS) > > @@ -64,12 +70,17 @@ $(ODP_RING): $(ODP_LIB) $(RING_OBJS) > $(ECHO) Linking $< > $(CC) $(LDFLAGS) $(RING_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ > > +$(ODP_TIM): $(ODP_LIB) $(TIM_OBJS) > + $(ECHO) Linking $< > + $(CC) $(LDFLAGS) $(TIM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ > + > .PHONY: clean > clean: > $(RMDIR) $(OBJ_DIR) > $(RM) $(ODP_ATOMIC) > $(RM) $(ODP_SHM) > $(RM) $(ODP_RING) > + $(RM) $(ODP_TIM) > $(MAKE) -C $(ODP_DIR) clean > > .PHONY: install > @@ -78,3 +89,4 @@ install: > install -m 0755 $(ODP_ATOMIC) $(DESTDIR)/share/odp/ > install -m 0755 $(ODP_SHM) $(DESTDIR)/share/odp/ > install -m 0755 $(ODP_RING) $(DESTDIR)/share/odp/ > + install -m 0755 $(ODP_TIM) $(DESTDIR)/share/odp/ > diff --git a/test/api_test/odp_common.h b/test/api_test/odp_common.h > index e8201ac..f5183e1 100644 > --- a/test/api_test/odp_common.h > +++ b/test/api_test/odp_common.h > @@ -20,6 +20,7 @@ typedef enum { > ODP_SHM_TEST, > ODP_RING_TEST_BASIC, > ODP_RING_TEST_STRESS, > + ODP_TIMER_PING_TEST, > ODP_MAX_TEST > } odp_test_case_e; > > diff --git a/test/api_test/odp_timer_ping.c > b/test/api_test/odp_timer_ping.c > new file mode 100644 > index 0000000..c1abc27 > --- /dev/null > +++ b/test/api_test/odp_timer_ping.c > @@ -0,0 +1,335 @@ > +/* Copyright (c) 2014, Linaro Limited > + * All rights reserved. > + * > + * SPDX-License-Identifier: BSD-3-Clause > + */ > + > + > +/** > + * @file > + * > + * ODP timer ping example application. > + * application open PF_INET socket, every ping send request > + * will arm timer for some duration, if ping_ack rxvd with > + * time band.. listen thread will cancel timer and free the > + * tmo_buffer.. otherwise timer expiration event will exit > + * application lead to test failure.. > + * - two thread used, one listener other one sender. > + * - run ./odp_timer <ipadder> > + * In ubuntu, you need run using sudo ./odp_timer <ipaddr> > + * - so to tigger timeout explicitly.. ping with badipaddr > + * Otherwise timeout may happen bcz of slow nw speed > + */ > + > + > +#include <unistd.h> > +#include <fcntl.h> > +#include <errno.h> > +#include <sys/socket.h> > +#include <resolv.h> > +#include <netdb.h> > +#include <netinet/in.h> > +#include <netinet/ip_icmp.h> > +#include <arpa/inet.h> > + > +#include <string.h> > +#include <odp.h> > +#include <odp_common.h> > +#include <odp_timer.h> > +#include <helper/odp_chksum.h> > + > +#define MSG_POOL_SIZE (4*1024*1024) > +#define BUF_SIZE 8 > +#define PING_CNT 10 > + > + > +static odp_timer_t test_timer_ping; > +static odp_timer_tmo_t test_ping_tmo; > + > +#define PKTSIZE 64 > +struct packet { > + struct icmphdr hdr; > + char msg[PKTSIZE-sizeof(struct icmphdr)]; > +}; > + > +int pid = -1; > +struct protoent *proto; > + > +struct sockaddr_in dst_addr; > + > +/* local struct for ping_timer_thread argument */ > +typedef struct { > + pthrd_arg thrdarg; > + int result; > +} ping_arg_t; > + > +static int ping_sync_flag; > + > + > +static void dump_icmp_pkt(void *buf, int bytes, int pkt_cnt) > +{ > + int i; > + struct iphdr *ip = buf; > + > + ODP_DBG("---dump icmp pkt_cnt %d------\n", pkt_cnt); > + for (i = 0; i < bytes; i++) { > + if (!(i & 15)) > + ODP_DBG("\n %x: ", i); > + ODP_DBG("%d ", ((unsigned char *)buf)[i]); > + } > + ODP_DBG("\n"); > + char addrstr[INET6_ADDRSTRLEN]; > + inet_ntop(AF_INET, &ip->daddr, addrstr, sizeof(addrstr)); > + ODP_DBG("byte %d, Ack rxvd for msg_cnt [%d] from %s\n", bytes, > pkt_cnt, addrstr); > +} > + > + > +static int listen_to_pingack(void) > +{ > + int sd, i; > + struct sockaddr_in addr; > + unsigned char buf[1024]; > + int bytes, len; > + > + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); > + if (sd < 0) { > + ODP_ERR("Listener socket open failed\n"); > + return -1; > + } > + > + for (i = 0; i < PING_CNT; i++) { > + len = sizeof(addr); > + > + bzero(buf, sizeof(buf)); > + bytes = recvfrom(sd, buf, sizeof(buf), 0, > + (struct sockaddr *)&addr, > + (socklen_t *)&len); > + if (bytes > 0) { > + /* pkt rxvd therefore cancel the timeout */ > + if (odp_timer_cancel_tmo(test_timer_ping, > + test_ping_tmo) != 0) { > + ODP_ERR("cancel_tmo failed ..exiting > listner thread\n"); > + return -1; > + } > + > + /* cruel bad hack used for sender, listner ipc.. > + * euwww.. FIXME .. > + */ > + ping_sync_flag = true; > + > + odp_buffer_free(test_ping_tmo); > + > + dump_icmp_pkt(buf, bytes, i); > + } else { > + ODP_ERR("recvfrom operation failed for msg_cnt > [%d]\n", i); > + return -1; > + } > + } > + > + return 0; > +} > + > + > +static int send_ping_request(struct sockaddr_in *addr) > +{ > + const int val = 255; > + uint32_t i, j; > + int sd, cnt = 1; > + struct packet pckt; > + > + uint64_t tick; > + odp_queue_t queue; > + odp_buffer_t buf; > + > + int thr; > + thr = odp_thread_id(); > + > + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); > + if (sd < 0) { > + ODP_ERR("Sender socket open failed\n"); > + return -1; > + } > + > + if (setsockopt(sd, SOL_IP, IP_TTL, &val, sizeof(val)) != 0) { > + ODP_ERR("Error setting TTL option\n"); > + return -1; > + } > + if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0) { > + ODP_ERR("Request for nonblocking I/O failed\n"); > + return -1; > + } > + > + /* get the ping queue */ > + queue = odp_queue_lookup("ping_timer_queue"); > + > + for (i = 0; i < PING_CNT; i++) { > + /* prepare icmp pkt */ > + bzero(&pckt, sizeof(pckt)); > + pckt.hdr.type = ICMP_ECHO; > + pckt.hdr.un.echo.id = pid; > + > + for (j = 0; j < sizeof(pckt.msg)-1; j++) > + pckt.msg[j] = j+'0'; > + > + pckt.msg[j] = 0; > + pckt.hdr.un.echo.sequence = cnt++; > + pckt.hdr.checksum = odp_chksum(&pckt, sizeof(pckt)); > + > + > + /* txmit the pkt */ > + if (sendto(sd, &pckt, sizeof(pckt), 0, > + (struct sockaddr *)addr, sizeof(*addr)) <= 0) { > + ODP_ERR("sendto operation failed msg_cnt > [%d]..exiting sender thread\n", i); > + return -1; > + } > + printf(" icmp_sent msg_cnt %d\n", i); > + > + /* arm the timer */ > + tick = odp_timer_current_tick(test_timer_ping); > + ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, tick); > + > + tick += 1000; > + test_ping_tmo = odp_timer_absolute_tmo(test_timer_ping, > tick, > + queue, > + > ODP_BUFFER_INVALID); > + > + /* wait for timeout event */ > + while ((buf = odp_queue_deq(queue) == ODP_BUFFER_INVALID)) > { > + /* flag true means ack rxvd.. a cruel hack as I > + * am confused on method to get away from while > + * loop in case of ack rxvd.. > + * FIXME.. > + */ > + if (ping_sync_flag) { > + ping_sync_flag = false; > + ODP_DBG(" [%d] done :)!!\n", i); > + buf = ODP_BUFFER_INVALID; > + break; > + } > + } > + > + /* free tmo_buf for timeout case */ > + if (buf != ODP_BUFFER_INVALID) { > + ODP_DBG(" [%i] timeout msg_cnt [%i] (:-\n", thr, > i); > + odp_buffer_free(buf); > + } > + } > + > + return 0; > +} > + > + > +static void *ping_timer_thread(void *arg) > +{ > + ping_arg_t *parg = (ping_arg_t *)arg; > + int thr; > + > + thr = odp_thread_id(); > + > + printf("Ping thread %i starts\n", thr); > + > + switch (parg->thrdarg.testcase) { > + case ODP_TIMER_PING_TEST: > + if (thr == 1) > + if (send_ping_request(&dst_addr) < 0) > + parg->result = -1; > + if (thr == 2) > + if (listen_to_pingack() < 0) > + parg->result = -1; > + break; > + default: > + ODP_ERR("Invalid test case [%d]\n", > parg->thrdarg.testcase); > + } > + > + > + fflush(stdout); > + > + return parg; > +} > + > +static int ping_init(int count, char *name[]) > +{ > + struct hostent *hname; > + if (count != 2) { > + ODP_ERR("usage: %s <hostaddr>\n", name[0]); > + return -1; > + } > + > + if (count > 1) { > + pid = getpid(); > + proto = getprotobyname("ICMP"); > + hname = gethostbyname(name[1]); > + bzero(&dst_addr, sizeof(dst_addr)); > + dst_addr.sin_family = hname->h_addrtype; > + dst_addr.sin_port = 0; > + dst_addr.sin_addr.s_addr = *(long *)hname->h_addr; > + } > + printf("ping to addr %s\n", name[1]); > + > + return 0; > +} > + > + > +int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) > +{ > + ping_arg_t pingarg; > + odp_queue_t queue; > + odp_buffer_pool_t pool; > + void *pool_base; > + > + if (odp_test_global_init() != 0) > + return -1; > + > + odp_print_system_info(); > + > + if (ping_init(argc, argv) != 0) > + return -1; > + > + /* > + * Create message pool > + */ > + pool_base = odp_shm_reserve("msg_pool", > + MSG_POOL_SIZE, > ODP_CACHE_LINE_SIZE); > + > + pool = odp_buffer_pool_create("msg_pool", pool_base, MSG_POOL_SIZE, > + BUF_SIZE, > + ODP_CACHE_LINE_SIZE, > + ODP_BUFFER_TYPE_RAW); > + if (pool == ODP_BUFFER_POOL_INVALID) { > + ODP_ERR("Pool create failed.\n"); > + return -1; > + } > + > + /* > + * Create a queue for timer test > + */ > + queue = odp_queue_create("ping_timer_queue", ODP_QUEUE_TYPE_SCHED, > + NULL); > + > + if (queue == ODP_QUEUE_INVALID) { > + ODP_ERR("Timer queue create failed.\n"); > + return -1; > + } > + > + test_timer_ping = odp_timer_create("ping_timer", pool, > + 1000000, 1000000, > 1000000000000); > + odp_shm_print_all(); > + > + pingarg.thrdarg.testcase = ODP_TIMER_PING_TEST; > + pingarg.thrdarg.numthrds = odp_sys_core_count(); > + > + pingarg.result = 0; > + > + /* Create and launch worker threads */ > + odp_test_thread_create(ping_timer_thread, (pthrd_arg *)&pingarg); > + > + /* Wait for worker threads to exit */ > + odp_test_thread_exit(&pingarg.thrdarg); > + > + ODP_DBG("ping timer test %s\n", (pingarg.result == 0) ? "passed" : > "failed"); > + > + printf("ODP ping timer test complete\n\n"); > + > + return 0; > +} > + > -- > 1.7.9.5 > > -- > You received this message because you are subscribed to the Google Groups > "LNG ODP Sub-team - lng-odp@linaro.org" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to lng-odp+unsubscribe@linaro.org. > To post to this group, send email to lng-odp@linaro.org. > Visit this group at http://groups.google.com/a/linaro.org/group/lng-odp/. > To view this discussion on the web visit > https://groups.google.com/a/linaro.org/d/msgid/lng-odp/1396061790-26705-2-git-send-email-santosh.shukla%40linaro.org > . > For more options, visit https://groups.google.com/a/linaro.org/d/optout. >
On 31 March 2014 06:56, Anders Roxell <anders.roxell@linaro.org> wrote: > > > > On 29 March 2014 03:56, Santosh Shukla <santosh.shukla@linaro.org> wrote: >> >> From: santosh shukla <santosh.shukla@linaro.org> >> >> Application open PF_INET socket, spawns two thread, >> one is sender_ping_thr another one listen_thr. >> Each send request arms timer for absolute timeout duration >> Whenever listner thread recieves ack, it cancels the timer_out >> and free the timeout buffer i.e. tmo_buf allocate while arming.. >> Otherwise timeout-event-notfier will enqueue time out even to >> queue for that pckt_cnt. >> >> Signed-off-by: santosh shukla <santosh.shukla@linaro.org> >> --- >> V2 change : >> - incorporated style comment in patch >> - odp queue based socket api need more changes specific >> to flag setting like socket flag, socket type, parameterising setsockopt >> this program need flags i.e..SOL_IP, IP_TTL etc,, >> At this point my initial effort says it will take little more time >> to get other parameter support in pktio socket param in odp >> therefore I suggest that this could be todo and seubsequent patch >> to include qeueue-base-socket method as and when I manage solve >> socket parameter problem for this application. >> >> V3 change : >> - Removed git am -3 <patch> warning. > > > This is not the solution, you need to remove the trailing newline in: > test/api_test/odp_timer_ping.c > Okay, But I dont find trailing newline.. Checkpatch doesn't inform me,, neither git am . Do you have method or vi editor setting which helps to know trailing newline?? > Cheers, > Anders > >> >> >> test/api_test/Makefile | 16 +- >> test/api_test/odp_common.h | 1 + >> test/api_test/odp_timer_ping.c | 335 >> ++++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 350 insertions(+), 2 deletions(-) >> create mode 100644 test/api_test/odp_timer_ping.c >> >> diff --git a/test/api_test/Makefile b/test/api_test/Makefile >> index bd99c50..0398cd2 100644 >> --- a/test/api_test/Makefile >> +++ b/test/api_test/Makefile >> @@ -11,6 +11,7 @@ ODP_ROOT = ../.. >> ODP_ATOMIC = odp_atomic >> ODP_SHM = odp_shm >> ODP_RING = odp_ring >> +ODP_TIM = odp_timer >> >> include $(ODP_ROOT)/Makefile.inc >> include ../Makefile.inc >> @@ -32,13 +33,18 @@ RING_OBJS = >> RING_OBJS += $(OBJ_DIR)/odp_common.o >> RING_OBJS += $(OBJ_DIR)/odp_ring_test.o >> >> -DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) >> +TIM_OBJS = >> +TIM_OBJS += $(OBJ_DIR)/odp_common.o >> +TIM_OBJS += $(OBJ_DIR)/odp_timer_ping.o >> + >> +DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) >> $(TIM_OBJS:.o=.d) >> >> .PHONY: all >> -all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) >> +all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) $(ODP_TIM) >> atomic: $(OBJ_DIR) $(ODP_ATOMIC) >> shm: $(OBJ_DIR) $(ODP_SHM) >> ring: $(OBJ_DIR) $(ODP_RING) >> +timer: $(OBJ_DIR) $(ODP_TIM) >> >> -include $(DEPS) >> >> @@ -64,12 +70,17 @@ $(ODP_RING): $(ODP_LIB) $(RING_OBJS) >> $(ECHO) Linking $< >> $(CC) $(LDFLAGS) $(RING_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ >> >> +$(ODP_TIM): $(ODP_LIB) $(TIM_OBJS) >> + $(ECHO) Linking $< >> + $(CC) $(LDFLAGS) $(TIM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ >> + >> .PHONY: clean >> clean: >> $(RMDIR) $(OBJ_DIR) >> $(RM) $(ODP_ATOMIC) >> $(RM) $(ODP_SHM) >> $(RM) $(ODP_RING) >> + $(RM) $(ODP_TIM) >> $(MAKE) -C $(ODP_DIR) clean >> >> .PHONY: install >> @@ -78,3 +89,4 @@ install: >> install -m 0755 $(ODP_ATOMIC) $(DESTDIR)/share/odp/ >> install -m 0755 $(ODP_SHM) $(DESTDIR)/share/odp/ >> install -m 0755 $(ODP_RING) $(DESTDIR)/share/odp/ >> + install -m 0755 $(ODP_TIM) $(DESTDIR)/share/odp/ >> diff --git a/test/api_test/odp_common.h b/test/api_test/odp_common.h >> index e8201ac..f5183e1 100644 >> --- a/test/api_test/odp_common.h >> +++ b/test/api_test/odp_common.h >> @@ -20,6 +20,7 @@ typedef enum { >> ODP_SHM_TEST, >> ODP_RING_TEST_BASIC, >> ODP_RING_TEST_STRESS, >> + ODP_TIMER_PING_TEST, >> ODP_MAX_TEST >> } odp_test_case_e; >> >> diff --git a/test/api_test/odp_timer_ping.c >> b/test/api_test/odp_timer_ping.c >> new file mode 100644 >> index 0000000..c1abc27 >> --- /dev/null >> +++ b/test/api_test/odp_timer_ping.c >> @@ -0,0 +1,335 @@ >> +/* Copyright (c) 2014, Linaro Limited >> + * All rights reserved. >> + * >> + * SPDX-License-Identifier: BSD-3-Clause >> + */ >> + >> + >> +/** >> + * @file >> + * >> + * ODP timer ping example application. >> + * application open PF_INET socket, every ping send request >> + * will arm timer for some duration, if ping_ack rxvd with >> + * time band.. listen thread will cancel timer and free the >> + * tmo_buffer.. otherwise timer expiration event will exit >> + * application lead to test failure.. >> + * - two thread used, one listener other one sender. >> + * - run ./odp_timer <ipadder> >> + * In ubuntu, you need run using sudo ./odp_timer <ipaddr> >> + * - so to tigger timeout explicitly.. ping with badipaddr >> + * Otherwise timeout may happen bcz of slow nw speed >> + */ >> + >> + >> +#include <unistd.h> >> +#include <fcntl.h> >> +#include <errno.h> >> +#include <sys/socket.h> >> +#include <resolv.h> >> +#include <netdb.h> >> +#include <netinet/in.h> >> +#include <netinet/ip_icmp.h> >> +#include <arpa/inet.h> >> + >> +#include <string.h> >> +#include <odp.h> >> +#include <odp_common.h> >> +#include <odp_timer.h> >> +#include <helper/odp_chksum.h> >> + >> +#define MSG_POOL_SIZE (4*1024*1024) >> +#define BUF_SIZE 8 >> +#define PING_CNT 10 >> + >> + >> +static odp_timer_t test_timer_ping; >> +static odp_timer_tmo_t test_ping_tmo; >> + >> +#define PKTSIZE 64 >> +struct packet { >> + struct icmphdr hdr; >> + char msg[PKTSIZE-sizeof(struct icmphdr)]; >> +}; >> + >> +int pid = -1; >> +struct protoent *proto; >> + >> +struct sockaddr_in dst_addr; >> + >> +/* local struct for ping_timer_thread argument */ >> +typedef struct { >> + pthrd_arg thrdarg; >> + int result; >> +} ping_arg_t; >> + >> +static int ping_sync_flag; >> + >> + >> +static void dump_icmp_pkt(void *buf, int bytes, int pkt_cnt) >> +{ >> + int i; >> + struct iphdr *ip = buf; >> + >> + ODP_DBG("---dump icmp pkt_cnt %d------\n", pkt_cnt); >> + for (i = 0; i < bytes; i++) { >> + if (!(i & 15)) >> + ODP_DBG("\n %x: ", i); >> + ODP_DBG("%d ", ((unsigned char *)buf)[i]); >> + } >> + ODP_DBG("\n"); >> + char addrstr[INET6_ADDRSTRLEN]; >> + inet_ntop(AF_INET, &ip->daddr, addrstr, sizeof(addrstr)); >> + ODP_DBG("byte %d, Ack rxvd for msg_cnt [%d] from %s\n", bytes, >> pkt_cnt, addrstr); >> +} >> + >> + >> +static int listen_to_pingack(void) >> +{ >> + int sd, i; >> + struct sockaddr_in addr; >> + unsigned char buf[1024]; >> + int bytes, len; >> + >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); >> + if (sd < 0) { >> + ODP_ERR("Listener socket open failed\n"); >> + return -1; >> + } >> + >> + for (i = 0; i < PING_CNT; i++) { >> + len = sizeof(addr); >> + >> + bzero(buf, sizeof(buf)); >> + bytes = recvfrom(sd, buf, sizeof(buf), 0, >> + (struct sockaddr *)&addr, >> + (socklen_t *)&len); >> + if (bytes > 0) { >> + /* pkt rxvd therefore cancel the timeout */ >> + if (odp_timer_cancel_tmo(test_timer_ping, >> + test_ping_tmo) != 0) { >> + ODP_ERR("cancel_tmo failed ..exiting >> listner thread\n"); >> + return -1; >> + } >> + >> + /* cruel bad hack used for sender, listner ipc.. >> + * euwww.. FIXME .. >> + */ >> + ping_sync_flag = true; >> + >> + odp_buffer_free(test_ping_tmo); >> + >> + dump_icmp_pkt(buf, bytes, i); >> + } else { >> + ODP_ERR("recvfrom operation failed for msg_cnt >> [%d]\n", i); >> + return -1; >> + } >> + } >> + >> + return 0; >> +} >> + >> + >> +static int send_ping_request(struct sockaddr_in *addr) >> +{ >> + const int val = 255; >> + uint32_t i, j; >> + int sd, cnt = 1; >> + struct packet pckt; >> + >> + uint64_t tick; >> + odp_queue_t queue; >> + odp_buffer_t buf; >> + >> + int thr; >> + thr = odp_thread_id(); >> + >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); >> + if (sd < 0) { >> + ODP_ERR("Sender socket open failed\n"); >> + return -1; >> + } >> + >> + if (setsockopt(sd, SOL_IP, IP_TTL, &val, sizeof(val)) != 0) { >> + ODP_ERR("Error setting TTL option\n"); >> + return -1; >> + } >> + if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0) { >> + ODP_ERR("Request for nonblocking I/O failed\n"); >> + return -1; >> + } >> + >> + /* get the ping queue */ >> + queue = odp_queue_lookup("ping_timer_queue"); >> + >> + for (i = 0; i < PING_CNT; i++) { >> + /* prepare icmp pkt */ >> + bzero(&pckt, sizeof(pckt)); >> + pckt.hdr.type = ICMP_ECHO; >> + pckt.hdr.un.echo.id = pid; >> + >> + for (j = 0; j < sizeof(pckt.msg)-1; j++) >> + pckt.msg[j] = j+'0'; >> + >> + pckt.msg[j] = 0; >> + pckt.hdr.un.echo.sequence = cnt++; >> + pckt.hdr.checksum = odp_chksum(&pckt, sizeof(pckt)); >> + >> + >> + /* txmit the pkt */ >> + if (sendto(sd, &pckt, sizeof(pckt), 0, >> + (struct sockaddr *)addr, sizeof(*addr)) <= 0) { >> + ODP_ERR("sendto operation failed msg_cnt >> [%d]..exiting sender thread\n", i); >> + return -1; >> + } >> + printf(" icmp_sent msg_cnt %d\n", i); >> + >> + /* arm the timer */ >> + tick = odp_timer_current_tick(test_timer_ping); >> + ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, tick); >> + >> + tick += 1000; >> + test_ping_tmo = odp_timer_absolute_tmo(test_timer_ping, >> tick, >> + queue, >> + >> ODP_BUFFER_INVALID); >> + >> + /* wait for timeout event */ >> + while ((buf = odp_queue_deq(queue) == ODP_BUFFER_INVALID)) >> { >> + /* flag true means ack rxvd.. a cruel hack as I >> + * am confused on method to get away from while >> + * loop in case of ack rxvd.. >> + * FIXME.. >> + */ >> + if (ping_sync_flag) { >> + ping_sync_flag = false; >> + ODP_DBG(" [%d] done :)!!\n", i); >> + buf = ODP_BUFFER_INVALID; >> + break; >> + } >> + } >> + >> + /* free tmo_buf for timeout case */ >> + if (buf != ODP_BUFFER_INVALID) { >> + ODP_DBG(" [%i] timeout msg_cnt [%i] (:-\n", thr, >> i); >> + odp_buffer_free(buf); >> + } >> + } >> + >> + return 0; >> +} >> + >> + >> +static void *ping_timer_thread(void *arg) >> +{ >> + ping_arg_t *parg = (ping_arg_t *)arg; >> + int thr; >> + >> + thr = odp_thread_id(); >> + >> + printf("Ping thread %i starts\n", thr); >> + >> + switch (parg->thrdarg.testcase) { >> + case ODP_TIMER_PING_TEST: >> + if (thr == 1) >> + if (send_ping_request(&dst_addr) < 0) >> + parg->result = -1; >> + if (thr == 2) >> + if (listen_to_pingack() < 0) >> + parg->result = -1; >> + break; >> + default: >> + ODP_ERR("Invalid test case [%d]\n", >> parg->thrdarg.testcase); >> + } >> + >> + >> + fflush(stdout); >> + >> + return parg; >> +} >> + >> +static int ping_init(int count, char *name[]) >> +{ >> + struct hostent *hname; >> + if (count != 2) { >> + ODP_ERR("usage: %s <hostaddr>\n", name[0]); >> + return -1; >> + } >> + >> + if (count > 1) { >> + pid = getpid(); >> + proto = getprotobyname("ICMP"); >> + hname = gethostbyname(name[1]); >> + bzero(&dst_addr, sizeof(dst_addr)); >> + dst_addr.sin_family = hname->h_addrtype; >> + dst_addr.sin_port = 0; >> + dst_addr.sin_addr.s_addr = *(long *)hname->h_addr; >> + } >> + printf("ping to addr %s\n", name[1]); >> + >> + return 0; >> +} >> + >> + >> +int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) >> +{ >> + ping_arg_t pingarg; >> + odp_queue_t queue; >> + odp_buffer_pool_t pool; >> + void *pool_base; >> + >> + if (odp_test_global_init() != 0) >> + return -1; >> + >> + odp_print_system_info(); >> + >> + if (ping_init(argc, argv) != 0) >> + return -1; >> + >> + /* >> + * Create message pool >> + */ >> + pool_base = odp_shm_reserve("msg_pool", >> + MSG_POOL_SIZE, >> ODP_CACHE_LINE_SIZE); >> + >> + pool = odp_buffer_pool_create("msg_pool", pool_base, >> MSG_POOL_SIZE, >> + BUF_SIZE, >> + ODP_CACHE_LINE_SIZE, >> + ODP_BUFFER_TYPE_RAW); >> + if (pool == ODP_BUFFER_POOL_INVALID) { >> + ODP_ERR("Pool create failed.\n"); >> + return -1; >> + } >> + >> + /* >> + * Create a queue for timer test >> + */ >> + queue = odp_queue_create("ping_timer_queue", ODP_QUEUE_TYPE_SCHED, >> + NULL); >> + >> + if (queue == ODP_QUEUE_INVALID) { >> + ODP_ERR("Timer queue create failed.\n"); >> + return -1; >> + } >> + >> + test_timer_ping = odp_timer_create("ping_timer", pool, >> + 1000000, 1000000, >> 1000000000000); >> + odp_shm_print_all(); >> + >> + pingarg.thrdarg.testcase = ODP_TIMER_PING_TEST; >> + pingarg.thrdarg.numthrds = odp_sys_core_count(); >> + >> + pingarg.result = 0; >> + >> + /* Create and launch worker threads */ >> + odp_test_thread_create(ping_timer_thread, (pthrd_arg *)&pingarg); >> + >> + /* Wait for worker threads to exit */ >> + odp_test_thread_exit(&pingarg.thrdarg); >> + >> + ODP_DBG("ping timer test %s\n", (pingarg.result == 0) ? "passed" : >> "failed"); >> + >> + printf("ODP ping timer test complete\n\n"); >> + >> + return 0; >> +} >> + >> -- >> 1.7.9.5 >> >> -- >> You received this message because you are subscribed to the Google Groups >> "LNG ODP Sub-team - lng-odp@linaro.org" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to lng-odp+unsubscribe@linaro.org. >> To post to this group, send email to lng-odp@linaro.org. >> Visit this group at http://groups.google.com/a/linaro.org/group/lng-odp/. >> To view this discussion on the web visit >> https://groups.google.com/a/linaro.org/d/msgid/lng-odp/1396061790-26705-2-git-send-email-santosh.shukla%40linaro.org. >> For more options, visit https://groups.google.com/a/linaro.org/d/optout. > >
On 2014-03-31 12:17, Santosh Shukla wrote: > On 31 March 2014 06:56, Anders Roxell <anders.roxell@linaro.org> wrote: > > > > > > > > On 29 March 2014 03:56, Santosh Shukla <santosh.shukla@linaro.org> wrote: > >> > >> From: santosh shukla <santosh.shukla@linaro.org> > >> > >> Application open PF_INET socket, spawns two thread, > >> one is sender_ping_thr another one listen_thr. > >> Each send request arms timer for absolute timeout duration > >> Whenever listner thread recieves ack, it cancels the timer_out > >> and free the timeout buffer i.e. tmo_buf allocate while arming.. > >> Otherwise timeout-event-notfier will enqueue time out even to > >> queue for that pckt_cnt. > >> > >> Signed-off-by: santosh shukla <santosh.shukla@linaro.org> > >> --- > >> V2 change : > >> - incorporated style comment in patch > >> - odp queue based socket api need more changes specific > >> to flag setting like socket flag, socket type, parameterising setsockopt > >> this program need flags i.e..SOL_IP, IP_TTL etc,, > >> At this point my initial effort says it will take little more time > >> to get other parameter support in pktio socket param in odp > >> therefore I suggest that this could be todo and seubsequent patch > >> to include qeueue-base-socket method as and when I manage solve > >> socket parameter problem for this application. > >> > >> V3 change : > >> - Removed git am -3 <patch> warning. > > > > > > This is not the solution, you need to remove the trailing newline in: > > test/api_test/odp_timer_ping.c > > > > Okay, But I dont find trailing newline.. Checkpatch doesn't inform > me,, neither git am . Do you have method or vi editor setting which > helps to know trailing newline?? I saw it in my email reader (mutt), I tried to read it in gmail as well and saw it there as well, you can use git to see it also. git am patch git show <hash with the warning> I'm using vim as my editor, ":set number" the row numbers However, I'm unsure if the editor will help you, maybe. I've highlighted "problematic" newline see further down > > > Cheers, > > Anders > > > >> > >> > >> test/api_test/Makefile | 16 +- > >> test/api_test/odp_common.h | 1 + > >> test/api_test/odp_timer_ping.c | 335 > >> ++++++++++++++++++++++++++++++++++++++++ > >> 3 files changed, 350 insertions(+), 2 deletions(-) > >> create mode 100644 test/api_test/odp_timer_ping.c > >> > >> diff --git a/test/api_test/Makefile b/test/api_test/Makefile > >> index bd99c50..0398cd2 100644 > >> --- a/test/api_test/Makefile > >> +++ b/test/api_test/Makefile > >> @@ -11,6 +11,7 @@ ODP_ROOT = ../.. > >> ODP_ATOMIC = odp_atomic > >> ODP_SHM = odp_shm > >> ODP_RING = odp_ring > >> +ODP_TIM = odp_timer > >> > >> include $(ODP_ROOT)/Makefile.inc > >> include ../Makefile.inc > >> @@ -32,13 +33,18 @@ RING_OBJS = > >> RING_OBJS += $(OBJ_DIR)/odp_common.o > >> RING_OBJS += $(OBJ_DIR)/odp_ring_test.o > >> > >> -DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) > >> +TIM_OBJS = > >> +TIM_OBJS += $(OBJ_DIR)/odp_common.o > >> +TIM_OBJS += $(OBJ_DIR)/odp_timer_ping.o > >> + > >> +DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) > >> $(TIM_OBJS:.o=.d) > >> > >> .PHONY: all > >> -all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) > >> +all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) $(ODP_TIM) > >> atomic: $(OBJ_DIR) $(ODP_ATOMIC) > >> shm: $(OBJ_DIR) $(ODP_SHM) > >> ring: $(OBJ_DIR) $(ODP_RING) > >> +timer: $(OBJ_DIR) $(ODP_TIM) > >> > >> -include $(DEPS) > >> > >> @@ -64,12 +70,17 @@ $(ODP_RING): $(ODP_LIB) $(RING_OBJS) > >> $(ECHO) Linking $< > >> $(CC) $(LDFLAGS) $(RING_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ > >> > >> +$(ODP_TIM): $(ODP_LIB) $(TIM_OBJS) > >> + $(ECHO) Linking $< > >> + $(CC) $(LDFLAGS) $(TIM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ > >> + > >> .PHONY: clean > >> clean: > >> $(RMDIR) $(OBJ_DIR) > >> $(RM) $(ODP_ATOMIC) > >> $(RM) $(ODP_SHM) > >> $(RM) $(ODP_RING) > >> + $(RM) $(ODP_TIM) > >> $(MAKE) -C $(ODP_DIR) clean > >> > >> .PHONY: install > >> @@ -78,3 +89,4 @@ install: > >> install -m 0755 $(ODP_ATOMIC) $(DESTDIR)/share/odp/ > >> install -m 0755 $(ODP_SHM) $(DESTDIR)/share/odp/ > >> install -m 0755 $(ODP_RING) $(DESTDIR)/share/odp/ > >> + install -m 0755 $(ODP_TIM) $(DESTDIR)/share/odp/ > >> diff --git a/test/api_test/odp_common.h b/test/api_test/odp_common.h > >> index e8201ac..f5183e1 100644 > >> --- a/test/api_test/odp_common.h > >> +++ b/test/api_test/odp_common.h > >> @@ -20,6 +20,7 @@ typedef enum { > >> ODP_SHM_TEST, > >> ODP_RING_TEST_BASIC, > >> ODP_RING_TEST_STRESS, > >> + ODP_TIMER_PING_TEST, > >> ODP_MAX_TEST > >> } odp_test_case_e; > >> > >> diff --git a/test/api_test/odp_timer_ping.c > >> b/test/api_test/odp_timer_ping.c > >> new file mode 100644 > >> index 0000000..c1abc27 > >> --- /dev/null > >> +++ b/test/api_test/odp_timer_ping.c > >> @@ -0,0 +1,335 @@ > >> +/* Copyright (c) 2014, Linaro Limited > >> + * All rights reserved. > >> + * > >> + * SPDX-License-Identifier: BSD-3-Clause > >> + */ > >> + > >> + > >> +/** > >> + * @file > >> + * > >> + * ODP timer ping example application. > >> + * application open PF_INET socket, every ping send request > >> + * will arm timer for some duration, if ping_ack rxvd with > >> + * time band.. listen thread will cancel timer and free the > >> + * tmo_buffer.. otherwise timer expiration event will exit > >> + * application lead to test failure.. > >> + * - two thread used, one listener other one sender. > >> + * - run ./odp_timer <ipadder> > >> + * In ubuntu, you need run using sudo ./odp_timer <ipaddr> > >> + * - so to tigger timeout explicitly.. ping with badipaddr > >> + * Otherwise timeout may happen bcz of slow nw speed > >> + */ > >> + > >> + > >> +#include <unistd.h> > >> +#include <fcntl.h> > >> +#include <errno.h> > >> +#include <sys/socket.h> > >> +#include <resolv.h> > >> +#include <netdb.h> > >> +#include <netinet/in.h> > >> +#include <netinet/ip_icmp.h> > >> +#include <arpa/inet.h> > >> + > >> +#include <string.h> > >> +#include <odp.h> > >> +#include <odp_common.h> > >> +#include <odp_timer.h> > >> +#include <helper/odp_chksum.h> > >> + > >> +#define MSG_POOL_SIZE (4*1024*1024) > >> +#define BUF_SIZE 8 > >> +#define PING_CNT 10 > >> + > >> + > >> +static odp_timer_t test_timer_ping; > >> +static odp_timer_tmo_t test_ping_tmo; > >> + > >> +#define PKTSIZE 64 > >> +struct packet { > >> + struct icmphdr hdr; > >> + char msg[PKTSIZE-sizeof(struct icmphdr)]; > >> +}; > >> + > >> +int pid = -1; > >> +struct protoent *proto; > >> + > >> +struct sockaddr_in dst_addr; > >> + > >> +/* local struct for ping_timer_thread argument */ > >> +typedef struct { > >> + pthrd_arg thrdarg; > >> + int result; > >> +} ping_arg_t; > >> + > >> +static int ping_sync_flag; > >> + > >> + > >> +static void dump_icmp_pkt(void *buf, int bytes, int pkt_cnt) > >> +{ > >> + int i; > >> + struct iphdr *ip = buf; > >> + > >> + ODP_DBG("---dump icmp pkt_cnt %d------\n", pkt_cnt); > >> + for (i = 0; i < bytes; i++) { > >> + if (!(i & 15)) > >> + ODP_DBG("\n %x: ", i); > >> + ODP_DBG("%d ", ((unsigned char *)buf)[i]); > >> + } > >> + ODP_DBG("\n"); > >> + char addrstr[INET6_ADDRSTRLEN]; > >> + inet_ntop(AF_INET, &ip->daddr, addrstr, sizeof(addrstr)); > >> + ODP_DBG("byte %d, Ack rxvd for msg_cnt [%d] from %s\n", bytes, > >> pkt_cnt, addrstr); > >> +} > >> + > >> + > >> +static int listen_to_pingack(void) > >> +{ > >> + int sd, i; > >> + struct sockaddr_in addr; > >> + unsigned char buf[1024]; > >> + int bytes, len; > >> + > >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); > >> + if (sd < 0) { > >> + ODP_ERR("Listener socket open failed\n"); > >> + return -1; > >> + } > >> + > >> + for (i = 0; i < PING_CNT; i++) { > >> + len = sizeof(addr); > >> + > >> + bzero(buf, sizeof(buf)); > >> + bytes = recvfrom(sd, buf, sizeof(buf), 0, > >> + (struct sockaddr *)&addr, > >> + (socklen_t *)&len); > >> + if (bytes > 0) { > >> + /* pkt rxvd therefore cancel the timeout */ > >> + if (odp_timer_cancel_tmo(test_timer_ping, > >> + test_ping_tmo) != 0) { > >> + ODP_ERR("cancel_tmo failed ..exiting > >> listner thread\n"); > >> + return -1; > >> + } > >> + > >> + /* cruel bad hack used for sender, listner ipc.. > >> + * euwww.. FIXME .. > >> + */ > >> + ping_sync_flag = true; > >> + > >> + odp_buffer_free(test_ping_tmo); > >> + > >> + dump_icmp_pkt(buf, bytes, i); > >> + } else { > >> + ODP_ERR("recvfrom operation failed for msg_cnt > >> [%d]\n", i); > >> + return -1; > >> + } > >> + } > >> + > >> + return 0; > >> +} > >> + > >> + > >> +static int send_ping_request(struct sockaddr_in *addr) > >> +{ > >> + const int val = 255; > >> + uint32_t i, j; > >> + int sd, cnt = 1; > >> + struct packet pckt; > >> + > >> + uint64_t tick; > >> + odp_queue_t queue; > >> + odp_buffer_t buf; > >> + > >> + int thr; > >> + thr = odp_thread_id(); > >> + > >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); > >> + if (sd < 0) { > >> + ODP_ERR("Sender socket open failed\n"); > >> + return -1; > >> + } > >> + > >> + if (setsockopt(sd, SOL_IP, IP_TTL, &val, sizeof(val)) != 0) { > >> + ODP_ERR("Error setting TTL option\n"); > >> + return -1; > >> + } > >> + if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0) { > >> + ODP_ERR("Request for nonblocking I/O failed\n"); > >> + return -1; > >> + } > >> + > >> + /* get the ping queue */ > >> + queue = odp_queue_lookup("ping_timer_queue"); > >> + > >> + for (i = 0; i < PING_CNT; i++) { > >> + /* prepare icmp pkt */ > >> + bzero(&pckt, sizeof(pckt)); > >> + pckt.hdr.type = ICMP_ECHO; > >> + pckt.hdr.un.echo.id = pid; > >> + > >> + for (j = 0; j < sizeof(pckt.msg)-1; j++) > >> + pckt.msg[j] = j+'0'; > >> + > >> + pckt.msg[j] = 0; > >> + pckt.hdr.un.echo.sequence = cnt++; > >> + pckt.hdr.checksum = odp_chksum(&pckt, sizeof(pckt)); > >> + > >> + > >> + /* txmit the pkt */ > >> + if (sendto(sd, &pckt, sizeof(pckt), 0, > >> + (struct sockaddr *)addr, sizeof(*addr)) <= 0) { > >> + ODP_ERR("sendto operation failed msg_cnt > >> [%d]..exiting sender thread\n", i); > >> + return -1; > >> + } > >> + printf(" icmp_sent msg_cnt %d\n", i); > >> + > >> + /* arm the timer */ > >> + tick = odp_timer_current_tick(test_timer_ping); > >> + ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, tick); > >> + > >> + tick += 1000; > >> + test_ping_tmo = odp_timer_absolute_tmo(test_timer_ping, > >> tick, > >> + queue, > >> + > >> ODP_BUFFER_INVALID); > >> + > >> + /* wait for timeout event */ > >> + while ((buf = odp_queue_deq(queue) == ODP_BUFFER_INVALID)) > >> { > >> + /* flag true means ack rxvd.. a cruel hack as I > >> + * am confused on method to get away from while > >> + * loop in case of ack rxvd.. > >> + * FIXME.. > >> + */ > >> + if (ping_sync_flag) { > >> + ping_sync_flag = false; > >> + ODP_DBG(" [%d] done :)!!\n", i); > >> + buf = ODP_BUFFER_INVALID; > >> + break; > >> + } > >> + } > >> + > >> + /* free tmo_buf for timeout case */ > >> + if (buf != ODP_BUFFER_INVALID) { > >> + ODP_DBG(" [%i] timeout msg_cnt [%i] (:-\n", thr, > >> i); > >> + odp_buffer_free(buf); > >> + } > >> + } > >> + > >> + return 0; > >> +} > >> + > >> + > >> +static void *ping_timer_thread(void *arg) > >> +{ > >> + ping_arg_t *parg = (ping_arg_t *)arg; > >> + int thr; > >> + > >> + thr = odp_thread_id(); > >> + > >> + printf("Ping thread %i starts\n", thr); > >> + > >> + switch (parg->thrdarg.testcase) { > >> + case ODP_TIMER_PING_TEST: > >> + if (thr == 1) > >> + if (send_ping_request(&dst_addr) < 0) > >> + parg->result = -1; > >> + if (thr == 2) > >> + if (listen_to_pingack() < 0) > >> + parg->result = -1; > >> + break; > >> + default: > >> + ODP_ERR("Invalid test case [%d]\n", > >> parg->thrdarg.testcase); > >> + } > >> + > >> + > >> + fflush(stdout); > >> + > >> + return parg; > >> +} > >> + > >> +static int ping_init(int count, char *name[]) > >> +{ > >> + struct hostent *hname; > >> + if (count != 2) { > >> + ODP_ERR("usage: %s <hostaddr>\n", name[0]); > >> + return -1; > >> + } > >> + > >> + if (count > 1) { > >> + pid = getpid(); > >> + proto = getprotobyname("ICMP"); > >> + hname = gethostbyname(name[1]); > >> + bzero(&dst_addr, sizeof(dst_addr)); > >> + dst_addr.sin_family = hname->h_addrtype; > >> + dst_addr.sin_port = 0; > >> + dst_addr.sin_addr.s_addr = *(long *)hname->h_addr; > >> + } > >> + printf("ping to addr %s\n", name[1]); > >> + > >> + return 0; > >> +} > >> + > >> + > >> +int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) > >> +{ > >> + ping_arg_t pingarg; > >> + odp_queue_t queue; > >> + odp_buffer_pool_t pool; > >> + void *pool_base; > >> + > >> + if (odp_test_global_init() != 0) > >> + return -1; > >> + > >> + odp_print_system_info(); > >> + > >> + if (ping_init(argc, argv) != 0) > >> + return -1; > >> + > >> + /* > >> + * Create message pool > >> + */ > >> + pool_base = odp_shm_reserve("msg_pool", > >> + MSG_POOL_SIZE, > >> ODP_CACHE_LINE_SIZE); > >> + > >> + pool = odp_buffer_pool_create("msg_pool", pool_base, > >> MSG_POOL_SIZE, > >> + BUF_SIZE, > >> + ODP_CACHE_LINE_SIZE, > >> + ODP_BUFFER_TYPE_RAW); > >> + if (pool == ODP_BUFFER_POOL_INVALID) { > >> + ODP_ERR("Pool create failed.\n"); > >> + return -1; > >> + } > >> + > >> + /* > >> + * Create a queue for timer test > >> + */ > >> + queue = odp_queue_create("ping_timer_queue", ODP_QUEUE_TYPE_SCHED, > >> + NULL); > >> + > >> + if (queue == ODP_QUEUE_INVALID) { > >> + ODP_ERR("Timer queue create failed.\n"); > >> + return -1; > >> + } > >> + > >> + test_timer_ping = odp_timer_create("ping_timer", pool, > >> + 1000000, 1000000, > >> 1000000000000); > >> + odp_shm_print_all(); > >> + > >> + pingarg.thrdarg.testcase = ODP_TIMER_PING_TEST; > >> + pingarg.thrdarg.numthrds = odp_sys_core_count(); > >> + > >> + pingarg.result = 0; > >> + > >> + /* Create and launch worker threads */ > >> + odp_test_thread_create(ping_timer_thread, (pthrd_arg *)&pingarg); > >> + > >> + /* Wait for worker threads to exit */ > >> + odp_test_thread_exit(&pingarg.thrdarg); > >> + > >> + ODP_DBG("ping timer test %s\n", (pingarg.result == 0) ? "passed" : > >> "failed"); > >> + > >> + printf("ODP ping timer test complete\n\n"); > >> + > >> + return 0; > >> +} > >> + This is the newline that creates the warning. Cheers, Anders > >> -- > >> 1.7.9.5 > >> > >> -- > >> You received this message because you are subscribed to the Google Groups > >> "LNG ODP Sub-team - lng-odp@linaro.org" group. > >> To unsubscribe from this group and stop receiving emails from it, send an > >> email to lng-odp+unsubscribe@linaro.org. > >> To post to this group, send email to lng-odp@linaro.org. > >> Visit this group at http://groups.google.com/a/linaro.org/group/lng-odp/. > >> To view this discussion on the web visit > >> https://groups.google.com/a/linaro.org/d/msgid/lng-odp/1396061790-26705-2-git-send-email-santosh.shukla%40linaro.org. > >> For more options, visit https://groups.google.com/a/linaro.org/d/optout. > > > >
On 31 March 2014 13:41, Anders Roxell <anders.roxell@linaro.org> wrote: > On 2014-03-31 12:17, Santosh Shukla wrote: >> On 31 March 2014 06:56, Anders Roxell <anders.roxell@linaro.org> wrote: >> > >> > >> > >> > On 29 March 2014 03:56, Santosh Shukla <santosh.shukla@linaro.org> wrote: >> >> >> >> From: santosh shukla <santosh.shukla@linaro.org> >> >> >> >> Application open PF_INET socket, spawns two thread, >> >> one is sender_ping_thr another one listen_thr. >> >> Each send request arms timer for absolute timeout duration >> >> Whenever listner thread recieves ack, it cancels the timer_out >> >> and free the timeout buffer i.e. tmo_buf allocate while arming.. >> >> Otherwise timeout-event-notfier will enqueue time out even to >> >> queue for that pckt_cnt. >> >> >> >> Signed-off-by: santosh shukla <santosh.shukla@linaro.org> >> >> --- >> >> V2 change : >> >> - incorporated style comment in patch >> >> - odp queue based socket api need more changes specific >> >> to flag setting like socket flag, socket type, parameterising setsockopt >> >> this program need flags i.e..SOL_IP, IP_TTL etc,, >> >> At this point my initial effort says it will take little more time >> >> to get other parameter support in pktio socket param in odp >> >> therefore I suggest that this could be todo and seubsequent patch >> >> to include qeueue-base-socket method as and when I manage solve >> >> socket parameter problem for this application. >> >> >> >> V3 change : >> >> - Removed git am -3 <patch> warning. >> > >> > >> > This is not the solution, you need to remove the trailing newline in: >> > test/api_test/odp_timer_ping.c >> > >> >> Okay, But I dont find trailing newline.. Checkpatch doesn't inform >> me,, neither git am . Do you have method or vi editor setting which >> helps to know trailing newline?? > > I saw it in my email reader (mutt), I tried to read it in gmail as well > and saw it there as well, you can use git to see it also. > git am patch > git show <hash with the warning> > Not good enough to understand trailing newline from above guideline. Trailing newline at the end of patch (in my case) shown as a single patch if its wrong then I expected tool to warnon for me and also while applying patch i.e.. git am throws warning, could be a valid concern to remove those warning, Both cases are just fine in this case. I could still remove tailend newline but knowing a better way in future would help to avoid this discussion. Anyways, I will remove those tailend newline in patch. Thanks. > I'm using vim as my editor, ":set number" the row numbers > > However, I'm unsure if the editor will help you, maybe. > > I've highlighted "problematic" newline see further down > >> >> > Cheers, >> > Anders >> > >> >> >> >> >> >> test/api_test/Makefile | 16 +- >> >> test/api_test/odp_common.h | 1 + >> >> test/api_test/odp_timer_ping.c | 335 >> >> ++++++++++++++++++++++++++++++++++++++++ >> >> 3 files changed, 350 insertions(+), 2 deletions(-) >> >> create mode 100644 test/api_test/odp_timer_ping.c >> >> >> >> diff --git a/test/api_test/Makefile b/test/api_test/Makefile >> >> index bd99c50..0398cd2 100644 >> >> --- a/test/api_test/Makefile >> >> +++ b/test/api_test/Makefile >> >> @@ -11,6 +11,7 @@ ODP_ROOT = ../.. >> >> ODP_ATOMIC = odp_atomic >> >> ODP_SHM = odp_shm >> >> ODP_RING = odp_ring >> >> +ODP_TIM = odp_timer >> >> >> >> include $(ODP_ROOT)/Makefile.inc >> >> include ../Makefile.inc >> >> @@ -32,13 +33,18 @@ RING_OBJS = >> >> RING_OBJS += $(OBJ_DIR)/odp_common.o >> >> RING_OBJS += $(OBJ_DIR)/odp_ring_test.o >> >> >> >> -DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) >> >> +TIM_OBJS = >> >> +TIM_OBJS += $(OBJ_DIR)/odp_common.o >> >> +TIM_OBJS += $(OBJ_DIR)/odp_timer_ping.o >> >> + >> >> +DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) >> >> $(TIM_OBJS:.o=.d) >> >> >> >> .PHONY: all >> >> -all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) >> >> +all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) $(ODP_TIM) >> >> atomic: $(OBJ_DIR) $(ODP_ATOMIC) >> >> shm: $(OBJ_DIR) $(ODP_SHM) >> >> ring: $(OBJ_DIR) $(ODP_RING) >> >> +timer: $(OBJ_DIR) $(ODP_TIM) >> >> >> >> -include $(DEPS) >> >> >> >> @@ -64,12 +70,17 @@ $(ODP_RING): $(ODP_LIB) $(RING_OBJS) >> >> $(ECHO) Linking $< >> >> $(CC) $(LDFLAGS) $(RING_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ >> >> >> >> +$(ODP_TIM): $(ODP_LIB) $(TIM_OBJS) >> >> + $(ECHO) Linking $< >> >> + $(CC) $(LDFLAGS) $(TIM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ >> >> + >> >> .PHONY: clean >> >> clean: >> >> $(RMDIR) $(OBJ_DIR) >> >> $(RM) $(ODP_ATOMIC) >> >> $(RM) $(ODP_SHM) >> >> $(RM) $(ODP_RING) >> >> + $(RM) $(ODP_TIM) >> >> $(MAKE) -C $(ODP_DIR) clean >> >> >> >> .PHONY: install >> >> @@ -78,3 +89,4 @@ install: >> >> install -m 0755 $(ODP_ATOMIC) $(DESTDIR)/share/odp/ >> >> install -m 0755 $(ODP_SHM) $(DESTDIR)/share/odp/ >> >> install -m 0755 $(ODP_RING) $(DESTDIR)/share/odp/ >> >> + install -m 0755 $(ODP_TIM) $(DESTDIR)/share/odp/ >> >> diff --git a/test/api_test/odp_common.h b/test/api_test/odp_common.h >> >> index e8201ac..f5183e1 100644 >> >> --- a/test/api_test/odp_common.h >> >> +++ b/test/api_test/odp_common.h >> >> @@ -20,6 +20,7 @@ typedef enum { >> >> ODP_SHM_TEST, >> >> ODP_RING_TEST_BASIC, >> >> ODP_RING_TEST_STRESS, >> >> + ODP_TIMER_PING_TEST, >> >> ODP_MAX_TEST >> >> } odp_test_case_e; >> >> >> >> diff --git a/test/api_test/odp_timer_ping.c >> >> b/test/api_test/odp_timer_ping.c >> >> new file mode 100644 >> >> index 0000000..c1abc27 >> >> --- /dev/null >> >> +++ b/test/api_test/odp_timer_ping.c >> >> @@ -0,0 +1,335 @@ >> >> +/* Copyright (c) 2014, Linaro Limited >> >> + * All rights reserved. >> >> + * >> >> + * SPDX-License-Identifier: BSD-3-Clause >> >> + */ >> >> + >> >> + >> >> +/** >> >> + * @file >> >> + * >> >> + * ODP timer ping example application. >> >> + * application open PF_INET socket, every ping send request >> >> + * will arm timer for some duration, if ping_ack rxvd with >> >> + * time band.. listen thread will cancel timer and free the >> >> + * tmo_buffer.. otherwise timer expiration event will exit >> >> + * application lead to test failure.. >> >> + * - two thread used, one listener other one sender. >> >> + * - run ./odp_timer <ipadder> >> >> + * In ubuntu, you need run using sudo ./odp_timer <ipaddr> >> >> + * - so to tigger timeout explicitly.. ping with badipaddr >> >> + * Otherwise timeout may happen bcz of slow nw speed >> >> + */ >> >> + >> >> + >> >> +#include <unistd.h> >> >> +#include <fcntl.h> >> >> +#include <errno.h> >> >> +#include <sys/socket.h> >> >> +#include <resolv.h> >> >> +#include <netdb.h> >> >> +#include <netinet/in.h> >> >> +#include <netinet/ip_icmp.h> >> >> +#include <arpa/inet.h> >> >> + >> >> +#include <string.h> >> >> +#include <odp.h> >> >> +#include <odp_common.h> >> >> +#include <odp_timer.h> >> >> +#include <helper/odp_chksum.h> >> >> + >> >> +#define MSG_POOL_SIZE (4*1024*1024) >> >> +#define BUF_SIZE 8 >> >> +#define PING_CNT 10 >> >> + >> >> + >> >> +static odp_timer_t test_timer_ping; >> >> +static odp_timer_tmo_t test_ping_tmo; >> >> + >> >> +#define PKTSIZE 64 >> >> +struct packet { >> >> + struct icmphdr hdr; >> >> + char msg[PKTSIZE-sizeof(struct icmphdr)]; >> >> +}; >> >> + >> >> +int pid = -1; >> >> +struct protoent *proto; >> >> + >> >> +struct sockaddr_in dst_addr; >> >> + >> >> +/* local struct for ping_timer_thread argument */ >> >> +typedef struct { >> >> + pthrd_arg thrdarg; >> >> + int result; >> >> +} ping_arg_t; >> >> + >> >> +static int ping_sync_flag; >> >> + >> >> + >> >> +static void dump_icmp_pkt(void *buf, int bytes, int pkt_cnt) >> >> +{ >> >> + int i; >> >> + struct iphdr *ip = buf; >> >> + >> >> + ODP_DBG("---dump icmp pkt_cnt %d------\n", pkt_cnt); >> >> + for (i = 0; i < bytes; i++) { >> >> + if (!(i & 15)) >> >> + ODP_DBG("\n %x: ", i); >> >> + ODP_DBG("%d ", ((unsigned char *)buf)[i]); >> >> + } >> >> + ODP_DBG("\n"); >> >> + char addrstr[INET6_ADDRSTRLEN]; >> >> + inet_ntop(AF_INET, &ip->daddr, addrstr, sizeof(addrstr)); >> >> + ODP_DBG("byte %d, Ack rxvd for msg_cnt [%d] from %s\n", bytes, >> >> pkt_cnt, addrstr); >> >> +} >> >> + >> >> + >> >> +static int listen_to_pingack(void) >> >> +{ >> >> + int sd, i; >> >> + struct sockaddr_in addr; >> >> + unsigned char buf[1024]; >> >> + int bytes, len; >> >> + >> >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); >> >> + if (sd < 0) { >> >> + ODP_ERR("Listener socket open failed\n"); >> >> + return -1; >> >> + } >> >> + >> >> + for (i = 0; i < PING_CNT; i++) { >> >> + len = sizeof(addr); >> >> + >> >> + bzero(buf, sizeof(buf)); >> >> + bytes = recvfrom(sd, buf, sizeof(buf), 0, >> >> + (struct sockaddr *)&addr, >> >> + (socklen_t *)&len); >> >> + if (bytes > 0) { >> >> + /* pkt rxvd therefore cancel the timeout */ >> >> + if (odp_timer_cancel_tmo(test_timer_ping, >> >> + test_ping_tmo) != 0) { >> >> + ODP_ERR("cancel_tmo failed ..exiting >> >> listner thread\n"); >> >> + return -1; >> >> + } >> >> + >> >> + /* cruel bad hack used for sender, listner ipc.. >> >> + * euwww.. FIXME .. >> >> + */ >> >> + ping_sync_flag = true; >> >> + >> >> + odp_buffer_free(test_ping_tmo); >> >> + >> >> + dump_icmp_pkt(buf, bytes, i); >> >> + } else { >> >> + ODP_ERR("recvfrom operation failed for msg_cnt >> >> [%d]\n", i); >> >> + return -1; >> >> + } >> >> + } >> >> + >> >> + return 0; >> >> +} >> >> + >> >> + >> >> +static int send_ping_request(struct sockaddr_in *addr) >> >> +{ >> >> + const int val = 255; >> >> + uint32_t i, j; >> >> + int sd, cnt = 1; >> >> + struct packet pckt; >> >> + >> >> + uint64_t tick; >> >> + odp_queue_t queue; >> >> + odp_buffer_t buf; >> >> + >> >> + int thr; >> >> + thr = odp_thread_id(); >> >> + >> >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); >> >> + if (sd < 0) { >> >> + ODP_ERR("Sender socket open failed\n"); >> >> + return -1; >> >> + } >> >> + >> >> + if (setsockopt(sd, SOL_IP, IP_TTL, &val, sizeof(val)) != 0) { >> >> + ODP_ERR("Error setting TTL option\n"); >> >> + return -1; >> >> + } >> >> + if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0) { >> >> + ODP_ERR("Request for nonblocking I/O failed\n"); >> >> + return -1; >> >> + } >> >> + >> >> + /* get the ping queue */ >> >> + queue = odp_queue_lookup("ping_timer_queue"); >> >> + >> >> + for (i = 0; i < PING_CNT; i++) { >> >> + /* prepare icmp pkt */ >> >> + bzero(&pckt, sizeof(pckt)); >> >> + pckt.hdr.type = ICMP_ECHO; >> >> + pckt.hdr.un.echo.id = pid; >> >> + >> >> + for (j = 0; j < sizeof(pckt.msg)-1; j++) >> >> + pckt.msg[j] = j+'0'; >> >> + >> >> + pckt.msg[j] = 0; >> >> + pckt.hdr.un.echo.sequence = cnt++; >> >> + pckt.hdr.checksum = odp_chksum(&pckt, sizeof(pckt)); >> >> + >> >> + >> >> + /* txmit the pkt */ >> >> + if (sendto(sd, &pckt, sizeof(pckt), 0, >> >> + (struct sockaddr *)addr, sizeof(*addr)) <= 0) { >> >> + ODP_ERR("sendto operation failed msg_cnt >> >> [%d]..exiting sender thread\n", i); >> >> + return -1; >> >> + } >> >> + printf(" icmp_sent msg_cnt %d\n", i); >> >> + >> >> + /* arm the timer */ >> >> + tick = odp_timer_current_tick(test_timer_ping); >> >> + ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, tick); >> >> + >> >> + tick += 1000; >> >> + test_ping_tmo = odp_timer_absolute_tmo(test_timer_ping, >> >> tick, >> >> + queue, >> >> + >> >> ODP_BUFFER_INVALID); >> >> + >> >> + /* wait for timeout event */ >> >> + while ((buf = odp_queue_deq(queue) == ODP_BUFFER_INVALID)) >> >> { >> >> + /* flag true means ack rxvd.. a cruel hack as I >> >> + * am confused on method to get away from while >> >> + * loop in case of ack rxvd.. >> >> + * FIXME.. >> >> + */ >> >> + if (ping_sync_flag) { >> >> + ping_sync_flag = false; >> >> + ODP_DBG(" [%d] done :)!!\n", i); >> >> + buf = ODP_BUFFER_INVALID; >> >> + break; >> >> + } >> >> + } >> >> + >> >> + /* free tmo_buf for timeout case */ >> >> + if (buf != ODP_BUFFER_INVALID) { >> >> + ODP_DBG(" [%i] timeout msg_cnt [%i] (:-\n", thr, >> >> i); >> >> + odp_buffer_free(buf); >> >> + } >> >> + } >> >> + >> >> + return 0; >> >> +} >> >> + >> >> + >> >> +static void *ping_timer_thread(void *arg) >> >> +{ >> >> + ping_arg_t *parg = (ping_arg_t *)arg; >> >> + int thr; >> >> + >> >> + thr = odp_thread_id(); >> >> + >> >> + printf("Ping thread %i starts\n", thr); >> >> + >> >> + switch (parg->thrdarg.testcase) { >> >> + case ODP_TIMER_PING_TEST: >> >> + if (thr == 1) >> >> + if (send_ping_request(&dst_addr) < 0) >> >> + parg->result = -1; >> >> + if (thr == 2) >> >> + if (listen_to_pingack() < 0) >> >> + parg->result = -1; >> >> + break; >> >> + default: >> >> + ODP_ERR("Invalid test case [%d]\n", >> >> parg->thrdarg.testcase); >> >> + } >> >> + >> >> + >> >> + fflush(stdout); >> >> + >> >> + return parg; >> >> +} >> >> + >> >> +static int ping_init(int count, char *name[]) >> >> +{ >> >> + struct hostent *hname; >> >> + if (count != 2) { >> >> + ODP_ERR("usage: %s <hostaddr>\n", name[0]); >> >> + return -1; >> >> + } >> >> + >> >> + if (count > 1) { >> >> + pid = getpid(); >> >> + proto = getprotobyname("ICMP"); >> >> + hname = gethostbyname(name[1]); >> >> + bzero(&dst_addr, sizeof(dst_addr)); >> >> + dst_addr.sin_family = hname->h_addrtype; >> >> + dst_addr.sin_port = 0; >> >> + dst_addr.sin_addr.s_addr = *(long *)hname->h_addr; >> >> + } >> >> + printf("ping to addr %s\n", name[1]); >> >> + >> >> + return 0; >> >> +} >> >> + >> >> + >> >> +int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) >> >> +{ >> >> + ping_arg_t pingarg; >> >> + odp_queue_t queue; >> >> + odp_buffer_pool_t pool; >> >> + void *pool_base; >> >> + >> >> + if (odp_test_global_init() != 0) >> >> + return -1; >> >> + >> >> + odp_print_system_info(); >> >> + >> >> + if (ping_init(argc, argv) != 0) >> >> + return -1; >> >> + >> >> + /* >> >> + * Create message pool >> >> + */ >> >> + pool_base = odp_shm_reserve("msg_pool", >> >> + MSG_POOL_SIZE, >> >> ODP_CACHE_LINE_SIZE); >> >> + >> >> + pool = odp_buffer_pool_create("msg_pool", pool_base, >> >> MSG_POOL_SIZE, >> >> + BUF_SIZE, >> >> + ODP_CACHE_LINE_SIZE, >> >> + ODP_BUFFER_TYPE_RAW); >> >> + if (pool == ODP_BUFFER_POOL_INVALID) { >> >> + ODP_ERR("Pool create failed.\n"); >> >> + return -1; >> >> + } >> >> + >> >> + /* >> >> + * Create a queue for timer test >> >> + */ >> >> + queue = odp_queue_create("ping_timer_queue", ODP_QUEUE_TYPE_SCHED, >> >> + NULL); >> >> + >> >> + if (queue == ODP_QUEUE_INVALID) { >> >> + ODP_ERR("Timer queue create failed.\n"); >> >> + return -1; >> >> + } >> >> + >> >> + test_timer_ping = odp_timer_create("ping_timer", pool, >> >> + 1000000, 1000000, >> >> 1000000000000); >> >> + odp_shm_print_all(); >> >> + >> >> + pingarg.thrdarg.testcase = ODP_TIMER_PING_TEST; >> >> + pingarg.thrdarg.numthrds = odp_sys_core_count(); >> >> + >> >> + pingarg.result = 0; >> >> + >> >> + /* Create and launch worker threads */ >> >> + odp_test_thread_create(ping_timer_thread, (pthrd_arg *)&pingarg); >> >> + >> >> + /* Wait for worker threads to exit */ >> >> + odp_test_thread_exit(&pingarg.thrdarg); >> >> + >> >> + ODP_DBG("ping timer test %s\n", (pingarg.result == 0) ? "passed" : >> >> "failed"); >> >> + >> >> + printf("ODP ping timer test complete\n\n"); >> >> + >> >> + return 0; >> >> +} >> >> + > > This is the newline that creates the warning. > > Cheers, > Anders > >> >> -- >> >> 1.7.9.5 >> >> >> >> -- >> >> You received this message because you are subscribed to the Google Groups >> >> "LNG ODP Sub-team - lng-odp@linaro.org" group. >> >> To unsubscribe from this group and stop receiving emails from it, send an >> >> email to lng-odp+unsubscribe@linaro.org. >> >> To post to this group, send email to lng-odp@linaro.org. >> >> Visit this group at http://groups.google.com/a/linaro.org/group/lng-odp/. >> >> To view this discussion on the web visit >> >> https://groups.google.com/a/linaro.org/d/msgid/lng-odp/1396061790-26705-2-git-send-email-santosh.shukla%40linaro.org. >> >> For more options, visit https://groups.google.com/a/linaro.org/d/optout. >> > >> >
If helpful, I am using this in my .vimrc set listchars=eol:$,tab:>-,trail:~,extends:>,precedes:<,nbsp:_ and use :set list :set nolist to enable and disable highlighting them. You can also add "set list" to your vimrc, but I don't like that. Here is more stuff on that: http://vim.wikia.com/wiki/Highlight_unwanted_spaces On Tue, Apr 1, 2014 at 12:38 AM, Santosh Shukla <santosh.shukla@linaro.org>wrote: > On 31 March 2014 13:41, Anders Roxell <anders.roxell@linaro.org> wrote: > > On 2014-03-31 12:17, Santosh Shukla wrote: > >> On 31 March 2014 06:56, Anders Roxell <anders.roxell@linaro.org> wrote: > >> > > >> > > >> > > >> > On 29 March 2014 03:56, Santosh Shukla <santosh.shukla@linaro.org> > wrote: > >> >> > >> >> From: santosh shukla <santosh.shukla@linaro.org> > >> >> > >> >> Application open PF_INET socket, spawns two thread, > >> >> one is sender_ping_thr another one listen_thr. > >> >> Each send request arms timer for absolute timeout duration > >> >> Whenever listner thread recieves ack, it cancels the timer_out > >> >> and free the timeout buffer i.e. tmo_buf allocate while arming.. > >> >> Otherwise timeout-event-notfier will enqueue time out even to > >> >> queue for that pckt_cnt. > >> >> > >> >> Signed-off-by: santosh shukla <santosh.shukla@linaro.org> > >> >> --- > >> >> V2 change : > >> >> - incorporated style comment in patch > >> >> - odp queue based socket api need more changes specific > >> >> to flag setting like socket flag, socket type, parameterising > setsockopt > >> >> this program need flags i.e..SOL_IP, IP_TTL etc,, > >> >> At this point my initial effort says it will take little more time > >> >> to get other parameter support in pktio socket param in odp > >> >> therefore I suggest that this could be todo and seubsequent patch > >> >> to include qeueue-base-socket method as and when I manage solve > >> >> socket parameter problem for this application. > >> >> > >> >> V3 change : > >> >> - Removed git am -3 <patch> warning. > >> > > >> > > >> > This is not the solution, you need to remove the trailing newline in: > >> > test/api_test/odp_timer_ping.c > >> > > >> > >> Okay, But I dont find trailing newline.. Checkpatch doesn't inform > >> me,, neither git am . Do you have method or vi editor setting which > >> helps to know trailing newline?? > > > > I saw it in my email reader (mutt), I tried to read it in gmail as well > > and saw it there as well, you can use git to see it also. > > git am patch > > git show <hash with the warning> > > > > Not good enough to understand trailing newline from above guideline. > Trailing newline at the end of patch (in my case) shown as a single > patch if its wrong then I expected tool to warnon for me and also > while applying patch i.e.. git am throws warning, could be a valid > concern to remove those warning, Both cases are just fine in this > case. > > I could still remove tailend newline but knowing a better way in > future would help to avoid this discussion. > > Anyways, I will remove those tailend newline in patch. Thanks. > > > I'm using vim as my editor, ":set number" the row numbers > > > > However, I'm unsure if the editor will help you, maybe. > > > > I've highlighted "problematic" newline see further down > > > >> > >> > Cheers, > >> > Anders > >> > > >> >> > >> >> > >> >> test/api_test/Makefile | 16 +- > >> >> test/api_test/odp_common.h | 1 + > >> >> test/api_test/odp_timer_ping.c | 335 > >> >> ++++++++++++++++++++++++++++++++++++++++ > >> >> 3 files changed, 350 insertions(+), 2 deletions(-) > >> >> create mode 100644 test/api_test/odp_timer_ping.c > >> >> > >> >> diff --git a/test/api_test/Makefile b/test/api_test/Makefile > >> >> index bd99c50..0398cd2 100644 > >> >> --- a/test/api_test/Makefile > >> >> +++ b/test/api_test/Makefile > >> >> @@ -11,6 +11,7 @@ ODP_ROOT = ../.. > >> >> ODP_ATOMIC = odp_atomic > >> >> ODP_SHM = odp_shm > >> >> ODP_RING = odp_ring > >> >> +ODP_TIM = odp_timer > >> >> > >> >> include $(ODP_ROOT)/Makefile.inc > >> >> include ../Makefile.inc > >> >> @@ -32,13 +33,18 @@ RING_OBJS = > >> >> RING_OBJS += $(OBJ_DIR)/odp_common.o > >> >> RING_OBJS += $(OBJ_DIR)/odp_ring_test.o > >> >> > >> >> -DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) > >> >> +TIM_OBJS = > >> >> +TIM_OBJS += $(OBJ_DIR)/odp_common.o > >> >> +TIM_OBJS += $(OBJ_DIR)/odp_timer_ping.o > >> >> + > >> >> +DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) > >> >> $(TIM_OBJS:.o=.d) > >> >> > >> >> .PHONY: all > >> >> -all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) > >> >> +all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) $(ODP_TIM) > >> >> atomic: $(OBJ_DIR) $(ODP_ATOMIC) > >> >> shm: $(OBJ_DIR) $(ODP_SHM) > >> >> ring: $(OBJ_DIR) $(ODP_RING) > >> >> +timer: $(OBJ_DIR) $(ODP_TIM) > >> >> > >> >> -include $(DEPS) > >> >> > >> >> @@ -64,12 +70,17 @@ $(ODP_RING): $(ODP_LIB) $(RING_OBJS) > >> >> $(ECHO) Linking $< > >> >> $(CC) $(LDFLAGS) $(RING_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ > >> >> > >> >> +$(ODP_TIM): $(ODP_LIB) $(TIM_OBJS) > >> >> + $(ECHO) Linking $< > >> >> + $(CC) $(LDFLAGS) $(TIM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ > >> >> + > >> >> .PHONY: clean > >> >> clean: > >> >> $(RMDIR) $(OBJ_DIR) > >> >> $(RM) $(ODP_ATOMIC) > >> >> $(RM) $(ODP_SHM) > >> >> $(RM) $(ODP_RING) > >> >> + $(RM) $(ODP_TIM) > >> >> $(MAKE) -C $(ODP_DIR) clean > >> >> > >> >> .PHONY: install > >> >> @@ -78,3 +89,4 @@ install: > >> >> install -m 0755 $(ODP_ATOMIC) $(DESTDIR)/share/odp/ > >> >> install -m 0755 $(ODP_SHM) $(DESTDIR)/share/odp/ > >> >> install -m 0755 $(ODP_RING) $(DESTDIR)/share/odp/ > >> >> + install -m 0755 $(ODP_TIM) $(DESTDIR)/share/odp/ > >> >> diff --git a/test/api_test/odp_common.h b/test/api_test/odp_common.h > >> >> index e8201ac..f5183e1 100644 > >> >> --- a/test/api_test/odp_common.h > >> >> +++ b/test/api_test/odp_common.h > >> >> @@ -20,6 +20,7 @@ typedef enum { > >> >> ODP_SHM_TEST, > >> >> ODP_RING_TEST_BASIC, > >> >> ODP_RING_TEST_STRESS, > >> >> + ODP_TIMER_PING_TEST, > >> >> ODP_MAX_TEST > >> >> } odp_test_case_e; > >> >> > >> >> diff --git a/test/api_test/odp_timer_ping.c > >> >> b/test/api_test/odp_timer_ping.c > >> >> new file mode 100644 > >> >> index 0000000..c1abc27 > >> >> --- /dev/null > >> >> +++ b/test/api_test/odp_timer_ping.c > >> >> @@ -0,0 +1,335 @@ > >> >> +/* Copyright (c) 2014, Linaro Limited > >> >> + * All rights reserved. > >> >> + * > >> >> + * SPDX-License-Identifier: BSD-3-Clause > >> >> + */ > >> >> + > >> >> + > >> >> +/** > >> >> + * @file > >> >> + * > >> >> + * ODP timer ping example application. > >> >> + * application open PF_INET socket, every ping send request > >> >> + * will arm timer for some duration, if ping_ack rxvd with > >> >> + * time band.. listen thread will cancel timer and free the > >> >> + * tmo_buffer.. otherwise timer expiration event will exit > >> >> + * application lead to test failure.. > >> >> + * - two thread used, one listener other one sender. > >> >> + * - run ./odp_timer <ipadder> > >> >> + * In ubuntu, you need run using sudo ./odp_timer <ipaddr> > >> >> + * - so to tigger timeout explicitly.. ping with badipaddr > >> >> + * Otherwise timeout may happen bcz of slow nw speed > >> >> + */ > >> >> + > >> >> + > >> >> +#include <unistd.h> > >> >> +#include <fcntl.h> > >> >> +#include <errno.h> > >> >> +#include <sys/socket.h> > >> >> +#include <resolv.h> > >> >> +#include <netdb.h> > >> >> +#include <netinet/in.h> > >> >> +#include <netinet/ip_icmp.h> > >> >> +#include <arpa/inet.h> > >> >> + > >> >> +#include <string.h> > >> >> +#include <odp.h> > >> >> +#include <odp_common.h> > >> >> +#include <odp_timer.h> > >> >> +#include <helper/odp_chksum.h> > >> >> + > >> >> +#define MSG_POOL_SIZE (4*1024*1024) > >> >> +#define BUF_SIZE 8 > >> >> +#define PING_CNT 10 > >> >> + > >> >> + > >> >> +static odp_timer_t test_timer_ping; > >> >> +static odp_timer_tmo_t test_ping_tmo; > >> >> + > >> >> +#define PKTSIZE 64 > >> >> +struct packet { > >> >> + struct icmphdr hdr; > >> >> + char msg[PKTSIZE-sizeof(struct icmphdr)]; > >> >> +}; > >> >> + > >> >> +int pid = -1; > >> >> +struct protoent *proto; > >> >> + > >> >> +struct sockaddr_in dst_addr; > >> >> + > >> >> +/* local struct for ping_timer_thread argument */ > >> >> +typedef struct { > >> >> + pthrd_arg thrdarg; > >> >> + int result; > >> >> +} ping_arg_t; > >> >> + > >> >> +static int ping_sync_flag; > >> >> + > >> >> + > >> >> +static void dump_icmp_pkt(void *buf, int bytes, int pkt_cnt) > >> >> +{ > >> >> + int i; > >> >> + struct iphdr *ip = buf; > >> >> + > >> >> + ODP_DBG("---dump icmp pkt_cnt %d------\n", pkt_cnt); > >> >> + for (i = 0; i < bytes; i++) { > >> >> + if (!(i & 15)) > >> >> + ODP_DBG("\n %x: ", i); > >> >> + ODP_DBG("%d ", ((unsigned char *)buf)[i]); > >> >> + } > >> >> + ODP_DBG("\n"); > >> >> + char addrstr[INET6_ADDRSTRLEN]; > >> >> + inet_ntop(AF_INET, &ip->daddr, addrstr, sizeof(addrstr)); > >> >> + ODP_DBG("byte %d, Ack rxvd for msg_cnt [%d] from %s\n", > bytes, > >> >> pkt_cnt, addrstr); > >> >> +} > >> >> + > >> >> + > >> >> +static int listen_to_pingack(void) > >> >> +{ > >> >> + int sd, i; > >> >> + struct sockaddr_in addr; > >> >> + unsigned char buf[1024]; > >> >> + int bytes, len; > >> >> + > >> >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); > >> >> + if (sd < 0) { > >> >> + ODP_ERR("Listener socket open failed\n"); > >> >> + return -1; > >> >> + } > >> >> + > >> >> + for (i = 0; i < PING_CNT; i++) { > >> >> + len = sizeof(addr); > >> >> + > >> >> + bzero(buf, sizeof(buf)); > >> >> + bytes = recvfrom(sd, buf, sizeof(buf), 0, > >> >> + (struct sockaddr *)&addr, > >> >> + (socklen_t *)&len); > >> >> + if (bytes > 0) { > >> >> + /* pkt rxvd therefore cancel the timeout */ > >> >> + if (odp_timer_cancel_tmo(test_timer_ping, > >> >> + test_ping_tmo) != > 0) { > >> >> + ODP_ERR("cancel_tmo failed ..exiting > >> >> listner thread\n"); > >> >> + return -1; > >> >> + } > >> >> + > >> >> + /* cruel bad hack used for sender, listner > ipc.. > >> >> + * euwww.. FIXME .. > >> >> + */ > >> >> + ping_sync_flag = true; > >> >> + > >> >> + odp_buffer_free(test_ping_tmo); > >> >> + > >> >> + dump_icmp_pkt(buf, bytes, i); > >> >> + } else { > >> >> + ODP_ERR("recvfrom operation failed for > msg_cnt > >> >> [%d]\n", i); > >> >> + return -1; > >> >> + } > >> >> + } > >> >> + > >> >> + return 0; > >> >> +} > >> >> + > >> >> + > >> >> +static int send_ping_request(struct sockaddr_in *addr) > >> >> +{ > >> >> + const int val = 255; > >> >> + uint32_t i, j; > >> >> + int sd, cnt = 1; > >> >> + struct packet pckt; > >> >> + > >> >> + uint64_t tick; > >> >> + odp_queue_t queue; > >> >> + odp_buffer_t buf; > >> >> + > >> >> + int thr; > >> >> + thr = odp_thread_id(); > >> >> + > >> >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); > >> >> + if (sd < 0) { > >> >> + ODP_ERR("Sender socket open failed\n"); > >> >> + return -1; > >> >> + } > >> >> + > >> >> + if (setsockopt(sd, SOL_IP, IP_TTL, &val, sizeof(val)) != 0) { > >> >> + ODP_ERR("Error setting TTL option\n"); > >> >> + return -1; > >> >> + } > >> >> + if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0) { > >> >> + ODP_ERR("Request for nonblocking I/O failed\n"); > >> >> + return -1; > >> >> + } > >> >> + > >> >> + /* get the ping queue */ > >> >> + queue = odp_queue_lookup("ping_timer_queue"); > >> >> + > >> >> + for (i = 0; i < PING_CNT; i++) { > >> >> + /* prepare icmp pkt */ > >> >> + bzero(&pckt, sizeof(pckt)); > >> >> + pckt.hdr.type = ICMP_ECHO; > >> >> + pckt.hdr.un.echo.id = pid; > >> >> + > >> >> + for (j = 0; j < sizeof(pckt.msg)-1; j++) > >> >> + pckt.msg[j] = j+'0'; > >> >> + > >> >> + pckt.msg[j] = 0; > >> >> + pckt.hdr.un.echo.sequence = cnt++; > >> >> + pckt.hdr.checksum = odp_chksum(&pckt, sizeof(pckt)); > >> >> + > >> >> + > >> >> + /* txmit the pkt */ > >> >> + if (sendto(sd, &pckt, sizeof(pckt), 0, > >> >> + (struct sockaddr *)addr, sizeof(*addr)) > <= 0) { > >> >> + ODP_ERR("sendto operation failed msg_cnt > >> >> [%d]..exiting sender thread\n", i); > >> >> + return -1; > >> >> + } > >> >> + printf(" icmp_sent msg_cnt %d\n", i); > >> >> + > >> >> + /* arm the timer */ > >> >> + tick = odp_timer_current_tick(test_timer_ping); > >> >> + ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, > tick); > >> >> + > >> >> + tick += 1000; > >> >> + test_ping_tmo = > odp_timer_absolute_tmo(test_timer_ping, > >> >> tick, > >> >> + queue, > >> >> + > >> >> ODP_BUFFER_INVALID); > >> >> + > >> >> + /* wait for timeout event */ > >> >> + while ((buf = odp_queue_deq(queue) == > ODP_BUFFER_INVALID)) > >> >> { > >> >> + /* flag true means ack rxvd.. a cruel hack > as I > >> >> + * am confused on method to get away from > while > >> >> + * loop in case of ack rxvd.. > >> >> + * FIXME.. > >> >> + */ > >> >> + if (ping_sync_flag) { > >> >> + ping_sync_flag = false; > >> >> + ODP_DBG(" [%d] done :)!!\n", i); > >> >> + buf = ODP_BUFFER_INVALID; > >> >> + break; > >> >> + } > >> >> + } > >> >> + > >> >> + /* free tmo_buf for timeout case */ > >> >> + if (buf != ODP_BUFFER_INVALID) { > >> >> + ODP_DBG(" [%i] timeout msg_cnt [%i] (:-\n", > thr, > >> >> i); > >> >> + odp_buffer_free(buf); > >> >> + } > >> >> + } > >> >> + > >> >> + return 0; > >> >> +} > >> >> + > >> >> + > >> >> +static void *ping_timer_thread(void *arg) > >> >> +{ > >> >> + ping_arg_t *parg = (ping_arg_t *)arg; > >> >> + int thr; > >> >> + > >> >> + thr = odp_thread_id(); > >> >> + > >> >> + printf("Ping thread %i starts\n", thr); > >> >> + > >> >> + switch (parg->thrdarg.testcase) { > >> >> + case ODP_TIMER_PING_TEST: > >> >> + if (thr == 1) > >> >> + if (send_ping_request(&dst_addr) < 0) > >> >> + parg->result = -1; > >> >> + if (thr == 2) > >> >> + if (listen_to_pingack() < 0) > >> >> + parg->result = -1; > >> >> + break; > >> >> + default: > >> >> + ODP_ERR("Invalid test case [%d]\n", > >> >> parg->thrdarg.testcase); > >> >> + } > >> >> + > >> >> + > >> >> + fflush(stdout); > >> >> + > >> >> + return parg; > >> >> +} > >> >> + > >> >> +static int ping_init(int count, char *name[]) > >> >> +{ > >> >> + struct hostent *hname; > >> >> + if (count != 2) { > >> >> + ODP_ERR("usage: %s <hostaddr>\n", name[0]); > >> >> + return -1; > >> >> + } > >> >> + > >> >> + if (count > 1) { > >> >> + pid = getpid(); > >> >> + proto = getprotobyname("ICMP"); > >> >> + hname = gethostbyname(name[1]); > >> >> + bzero(&dst_addr, sizeof(dst_addr)); > >> >> + dst_addr.sin_family = hname->h_addrtype; > >> >> + dst_addr.sin_port = 0; > >> >> + dst_addr.sin_addr.s_addr = *(long *)hname->h_addr; > >> >> + } > >> >> + printf("ping to addr %s\n", name[1]); > >> >> + > >> >> + return 0; > >> >> +} > >> >> + > >> >> + > >> >> +int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) > >> >> +{ > >> >> + ping_arg_t pingarg; > >> >> + odp_queue_t queue; > >> >> + odp_buffer_pool_t pool; > >> >> + void *pool_base; > >> >> + > >> >> + if (odp_test_global_init() != 0) > >> >> + return -1; > >> >> + > >> >> + odp_print_system_info(); > >> >> + > >> >> + if (ping_init(argc, argv) != 0) > >> >> + return -1; > >> >> + > >> >> + /* > >> >> + * Create message pool > >> >> + */ > >> >> + pool_base = odp_shm_reserve("msg_pool", > >> >> + MSG_POOL_SIZE, > >> >> ODP_CACHE_LINE_SIZE); > >> >> + > >> >> + pool = odp_buffer_pool_create("msg_pool", pool_base, > >> >> MSG_POOL_SIZE, > >> >> + BUF_SIZE, > >> >> + ODP_CACHE_LINE_SIZE, > >> >> + ODP_BUFFER_TYPE_RAW); > >> >> + if (pool == ODP_BUFFER_POOL_INVALID) { > >> >> + ODP_ERR("Pool create failed.\n"); > >> >> + return -1; > >> >> + } > >> >> + > >> >> + /* > >> >> + * Create a queue for timer test > >> >> + */ > >> >> + queue = odp_queue_create("ping_timer_queue", > ODP_QUEUE_TYPE_SCHED, > >> >> + NULL); > >> >> + > >> >> + if (queue == ODP_QUEUE_INVALID) { > >> >> + ODP_ERR("Timer queue create failed.\n"); > >> >> + return -1; > >> >> + } > >> >> + > >> >> + test_timer_ping = odp_timer_create("ping_timer", pool, > >> >> + 1000000, 1000000, > >> >> 1000000000000); > >> >> + odp_shm_print_all(); > >> >> + > >> >> + pingarg.thrdarg.testcase = ODP_TIMER_PING_TEST; > >> >> + pingarg.thrdarg.numthrds = odp_sys_core_count(); > >> >> + > >> >> + pingarg.result = 0; > >> >> + > >> >> + /* Create and launch worker threads */ > >> >> + odp_test_thread_create(ping_timer_thread, (pthrd_arg > *)&pingarg); > >> >> + > >> >> + /* Wait for worker threads to exit */ > >> >> + odp_test_thread_exit(&pingarg.thrdarg); > >> >> + > >> >> + ODP_DBG("ping timer test %s\n", (pingarg.result == 0) ? > "passed" : > >> >> "failed"); > >> >> + > >> >> + printf("ODP ping timer test complete\n\n"); > >> >> + > >> >> + return 0; > >> >> +} > >> >> + > > > > This is the newline that creates the warning. > > > > Cheers, > > Anders > > > >> >> -- > >> >> 1.7.9.5 > >> >> > >> >> -- > >> >> You received this message because you are subscribed to the Google > Groups > >> >> "LNG ODP Sub-team - lng-odp@linaro.org" group. > >> >> To unsubscribe from this group and stop receiving emails from it, > send an > >> >> email to lng-odp+unsubscribe@linaro.org. > >> >> To post to this group, send email to lng-odp@linaro.org. > >> >> Visit this group at > http://groups.google.com/a/linaro.org/group/lng-odp/. > >> >> To view this discussion on the web visit > >> >> > https://groups.google.com/a/linaro.org/d/msgid/lng-odp/1396061790-26705-2-git-send-email-santosh.shukla%40linaro.org > . > >> >> For more options, visit > https://groups.google.com/a/linaro.org/d/optout. > >> > > >> > > > -- > You received this message because you are subscribed to the Google Groups > "LNG ODP Sub-team - lng-odp@linaro.org" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to lng-odp+unsubscribe@linaro.org. > To post to this group, send email to lng-odp@linaro.org. > Visit this group at http://groups.google.com/a/linaro.org/group/lng-odp/. > To view this discussion on the web visit > https://groups.google.com/a/linaro.org/d/msgid/lng-odp/CA%2BiXiiOuDS9aQxgiBEv2oFk3_i8pg%3DxnVSAPj-te9bx7c9psGg%40mail.gmail.com > . > For more options, visit https://groups.google.com/a/linaro.org/d/optout. >
On 1 April 2014 13:16, Ciprian Barbu <ciprian.barbu@linaro.org> wrote: > If helpful, I am using this in my .vimrc > > set listchars=eol:$,tab:>-,trail:~,extends:>,precedes:<,nbsp:_ > > and use > :set list > :set nolist > to enable and disable highlighting them. You can also add "set list" to your > vimrc, but I don't like that. Here is more stuff on that: > > http://vim.wikia.com/wiki/Highlight_unwanted_spaces Thanks Ciprian, those are helpful for me. I do have vim check for whitespaces and above addition a good extention in .vimrc for me. > > > On Tue, Apr 1, 2014 at 12:38 AM, Santosh Shukla <santosh.shukla@linaro.org> > wrote: >> >> On 31 March 2014 13:41, Anders Roxell <anders.roxell@linaro.org> wrote: >> > On 2014-03-31 12:17, Santosh Shukla wrote: >> >> On 31 March 2014 06:56, Anders Roxell <anders.roxell@linaro.org> wrote: >> >> > >> >> > >> >> > >> >> > On 29 March 2014 03:56, Santosh Shukla <santosh.shukla@linaro.org> >> >> > wrote: >> >> >> >> >> >> From: santosh shukla <santosh.shukla@linaro.org> >> >> >> >> >> >> Application open PF_INET socket, spawns two thread, >> >> >> one is sender_ping_thr another one listen_thr. >> >> >> Each send request arms timer for absolute timeout duration >> >> >> Whenever listner thread recieves ack, it cancels the timer_out >> >> >> and free the timeout buffer i.e. tmo_buf allocate while arming.. >> >> >> Otherwise timeout-event-notfier will enqueue time out even to >> >> >> queue for that pckt_cnt. >> >> >> >> >> >> Signed-off-by: santosh shukla <santosh.shukla@linaro.org> >> >> >> --- >> >> >> V2 change : >> >> >> - incorporated style comment in patch >> >> >> - odp queue based socket api need more changes specific >> >> >> to flag setting like socket flag, socket type, parameterising >> >> >> setsockopt >> >> >> this program need flags i.e..SOL_IP, IP_TTL etc,, >> >> >> At this point my initial effort says it will take little more time >> >> >> to get other parameter support in pktio socket param in odp >> >> >> therefore I suggest that this could be todo and seubsequent patch >> >> >> to include qeueue-base-socket method as and when I manage solve >> >> >> socket parameter problem for this application. >> >> >> >> >> >> V3 change : >> >> >> - Removed git am -3 <patch> warning. >> >> > >> >> > >> >> > This is not the solution, you need to remove the trailing newline in: >> >> > test/api_test/odp_timer_ping.c >> >> > >> >> >> >> Okay, But I dont find trailing newline.. Checkpatch doesn't inform >> >> me,, neither git am . Do you have method or vi editor setting which >> >> helps to know trailing newline?? >> > >> > I saw it in my email reader (mutt), I tried to read it in gmail as well >> > and saw it there as well, you can use git to see it also. >> > git am patch >> > git show <hash with the warning> >> > >> >> Not good enough to understand trailing newline from above guideline. >> Trailing newline at the end of patch (in my case) shown as a single >> patch if its wrong then I expected tool to warnon for me and also >> while applying patch i.e.. git am throws warning, could be a valid >> concern to remove those warning, Both cases are just fine in this >> case. >> >> I could still remove tailend newline but knowing a better way in >> future would help to avoid this discussion. >> >> Anyways, I will remove those tailend newline in patch. Thanks. >> >> > I'm using vim as my editor, ":set number" the row numbers >> > >> > However, I'm unsure if the editor will help you, maybe. >> > >> > I've highlighted "problematic" newline see further down >> > >> >> >> >> > Cheers, >> >> > Anders >> >> > >> >> >> >> >> >> >> >> >> test/api_test/Makefile | 16 +- >> >> >> test/api_test/odp_common.h | 1 + >> >> >> test/api_test/odp_timer_ping.c | 335 >> >> >> ++++++++++++++++++++++++++++++++++++++++ >> >> >> 3 files changed, 350 insertions(+), 2 deletions(-) >> >> >> create mode 100644 test/api_test/odp_timer_ping.c >> >> >> >> >> >> diff --git a/test/api_test/Makefile b/test/api_test/Makefile >> >> >> index bd99c50..0398cd2 100644 >> >> >> --- a/test/api_test/Makefile >> >> >> +++ b/test/api_test/Makefile >> >> >> @@ -11,6 +11,7 @@ ODP_ROOT = ../.. >> >> >> ODP_ATOMIC = odp_atomic >> >> >> ODP_SHM = odp_shm >> >> >> ODP_RING = odp_ring >> >> >> +ODP_TIM = odp_timer >> >> >> >> >> >> include $(ODP_ROOT)/Makefile.inc >> >> >> include ../Makefile.inc >> >> >> @@ -32,13 +33,18 @@ RING_OBJS = >> >> >> RING_OBJS += $(OBJ_DIR)/odp_common.o >> >> >> RING_OBJS += $(OBJ_DIR)/odp_ring_test.o >> >> >> >> >> >> -DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) >> >> >> $(RING_OBJS:.o=.d) >> >> >> +TIM_OBJS = >> >> >> +TIM_OBJS += $(OBJ_DIR)/odp_common.o >> >> >> +TIM_OBJS += $(OBJ_DIR)/odp_timer_ping.o >> >> >> + >> >> >> +DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) >> >> >> $(RING_OBJS:.o=.d) >> >> >> $(TIM_OBJS:.o=.d) >> >> >> >> >> >> .PHONY: all >> >> >> -all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) >> >> >> +all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) $(ODP_TIM) >> >> >> atomic: $(OBJ_DIR) $(ODP_ATOMIC) >> >> >> shm: $(OBJ_DIR) $(ODP_SHM) >> >> >> ring: $(OBJ_DIR) $(ODP_RING) >> >> >> +timer: $(OBJ_DIR) $(ODP_TIM) >> >> >> >> >> >> -include $(DEPS) >> >> >> >> >> >> @@ -64,12 +70,17 @@ $(ODP_RING): $(ODP_LIB) $(RING_OBJS) >> >> >> $(ECHO) Linking $< >> >> >> $(CC) $(LDFLAGS) $(RING_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ >> >> >> >> >> >> +$(ODP_TIM): $(ODP_LIB) $(TIM_OBJS) >> >> >> + $(ECHO) Linking $< >> >> >> + $(CC) $(LDFLAGS) $(TIM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ >> >> >> + >> >> >> .PHONY: clean >> >> >> clean: >> >> >> $(RMDIR) $(OBJ_DIR) >> >> >> $(RM) $(ODP_ATOMIC) >> >> >> $(RM) $(ODP_SHM) >> >> >> $(RM) $(ODP_RING) >> >> >> + $(RM) $(ODP_TIM) >> >> >> $(MAKE) -C $(ODP_DIR) clean >> >> >> >> >> >> .PHONY: install >> >> >> @@ -78,3 +89,4 @@ install: >> >> >> install -m 0755 $(ODP_ATOMIC) $(DESTDIR)/share/odp/ >> >> >> install -m 0755 $(ODP_SHM) $(DESTDIR)/share/odp/ >> >> >> install -m 0755 $(ODP_RING) $(DESTDIR)/share/odp/ >> >> >> + install -m 0755 $(ODP_TIM) $(DESTDIR)/share/odp/ >> >> >> diff --git a/test/api_test/odp_common.h b/test/api_test/odp_common.h >> >> >> index e8201ac..f5183e1 100644 >> >> >> --- a/test/api_test/odp_common.h >> >> >> +++ b/test/api_test/odp_common.h >> >> >> @@ -20,6 +20,7 @@ typedef enum { >> >> >> ODP_SHM_TEST, >> >> >> ODP_RING_TEST_BASIC, >> >> >> ODP_RING_TEST_STRESS, >> >> >> + ODP_TIMER_PING_TEST, >> >> >> ODP_MAX_TEST >> >> >> } odp_test_case_e; >> >> >> >> >> >> diff --git a/test/api_test/odp_timer_ping.c >> >> >> b/test/api_test/odp_timer_ping.c >> >> >> new file mode 100644 >> >> >> index 0000000..c1abc27 >> >> >> --- /dev/null >> >> >> +++ b/test/api_test/odp_timer_ping.c >> >> >> @@ -0,0 +1,335 @@ >> >> >> +/* Copyright (c) 2014, Linaro Limited >> >> >> + * All rights reserved. >> >> >> + * >> >> >> + * SPDX-License-Identifier: BSD-3-Clause >> >> >> + */ >> >> >> + >> >> >> + >> >> >> +/** >> >> >> + * @file >> >> >> + * >> >> >> + * ODP timer ping example application. >> >> >> + * application open PF_INET socket, every ping send request >> >> >> + * will arm timer for some duration, if ping_ack rxvd with >> >> >> + * time band.. listen thread will cancel timer and free the >> >> >> + * tmo_buffer.. otherwise timer expiration event will exit >> >> >> + * application lead to test failure.. >> >> >> + * - two thread used, one listener other one sender. >> >> >> + * - run ./odp_timer <ipadder> >> >> >> + * In ubuntu, you need run using sudo ./odp_timer <ipaddr> >> >> >> + * - so to tigger timeout explicitly.. ping with badipaddr >> >> >> + * Otherwise timeout may happen bcz of slow nw speed >> >> >> + */ >> >> >> + >> >> >> + >> >> >> +#include <unistd.h> >> >> >> +#include <fcntl.h> >> >> >> +#include <errno.h> >> >> >> +#include <sys/socket.h> >> >> >> +#include <resolv.h> >> >> >> +#include <netdb.h> >> >> >> +#include <netinet/in.h> >> >> >> +#include <netinet/ip_icmp.h> >> >> >> +#include <arpa/inet.h> >> >> >> + >> >> >> +#include <string.h> >> >> >> +#include <odp.h> >> >> >> +#include <odp_common.h> >> >> >> +#include <odp_timer.h> >> >> >> +#include <helper/odp_chksum.h> >> >> >> + >> >> >> +#define MSG_POOL_SIZE (4*1024*1024) >> >> >> +#define BUF_SIZE 8 >> >> >> +#define PING_CNT 10 >> >> >> + >> >> >> + >> >> >> +static odp_timer_t test_timer_ping; >> >> >> +static odp_timer_tmo_t test_ping_tmo; >> >> >> + >> >> >> +#define PKTSIZE 64 >> >> >> +struct packet { >> >> >> + struct icmphdr hdr; >> >> >> + char msg[PKTSIZE-sizeof(struct icmphdr)]; >> >> >> +}; >> >> >> + >> >> >> +int pid = -1; >> >> >> +struct protoent *proto; >> >> >> + >> >> >> +struct sockaddr_in dst_addr; >> >> >> + >> >> >> +/* local struct for ping_timer_thread argument */ >> >> >> +typedef struct { >> >> >> + pthrd_arg thrdarg; >> >> >> + int result; >> >> >> +} ping_arg_t; >> >> >> + >> >> >> +static int ping_sync_flag; >> >> >> + >> >> >> + >> >> >> +static void dump_icmp_pkt(void *buf, int bytes, int pkt_cnt) >> >> >> +{ >> >> >> + int i; >> >> >> + struct iphdr *ip = buf; >> >> >> + >> >> >> + ODP_DBG("---dump icmp pkt_cnt %d------\n", pkt_cnt); >> >> >> + for (i = 0; i < bytes; i++) { >> >> >> + if (!(i & 15)) >> >> >> + ODP_DBG("\n %x: ", i); >> >> >> + ODP_DBG("%d ", ((unsigned char *)buf)[i]); >> >> >> + } >> >> >> + ODP_DBG("\n"); >> >> >> + char addrstr[INET6_ADDRSTRLEN]; >> >> >> + inet_ntop(AF_INET, &ip->daddr, addrstr, sizeof(addrstr)); >> >> >> + ODP_DBG("byte %d, Ack rxvd for msg_cnt [%d] from %s\n", >> >> >> bytes, >> >> >> pkt_cnt, addrstr); >> >> >> +} >> >> >> + >> >> >> + >> >> >> +static int listen_to_pingack(void) >> >> >> +{ >> >> >> + int sd, i; >> >> >> + struct sockaddr_in addr; >> >> >> + unsigned char buf[1024]; >> >> >> + int bytes, len; >> >> >> + >> >> >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); >> >> >> + if (sd < 0) { >> >> >> + ODP_ERR("Listener socket open failed\n"); >> >> >> + return -1; >> >> >> + } >> >> >> + >> >> >> + for (i = 0; i < PING_CNT; i++) { >> >> >> + len = sizeof(addr); >> >> >> + >> >> >> + bzero(buf, sizeof(buf)); >> >> >> + bytes = recvfrom(sd, buf, sizeof(buf), 0, >> >> >> + (struct sockaddr *)&addr, >> >> >> + (socklen_t *)&len); >> >> >> + if (bytes > 0) { >> >> >> + /* pkt rxvd therefore cancel the timeout */ >> >> >> + if (odp_timer_cancel_tmo(test_timer_ping, >> >> >> + test_ping_tmo) != >> >> >> 0) { >> >> >> + ODP_ERR("cancel_tmo failed ..exiting >> >> >> listner thread\n"); >> >> >> + return -1; >> >> >> + } >> >> >> + >> >> >> + /* cruel bad hack used for sender, listner >> >> >> ipc.. >> >> >> + * euwww.. FIXME .. >> >> >> + */ >> >> >> + ping_sync_flag = true; >> >> >> + >> >> >> + odp_buffer_free(test_ping_tmo); >> >> >> + >> >> >> + dump_icmp_pkt(buf, bytes, i); >> >> >> + } else { >> >> >> + ODP_ERR("recvfrom operation failed for >> >> >> msg_cnt >> >> >> [%d]\n", i); >> >> >> + return -1; >> >> >> + } >> >> >> + } >> >> >> + >> >> >> + return 0; >> >> >> +} >> >> >> + >> >> >> + >> >> >> +static int send_ping_request(struct sockaddr_in *addr) >> >> >> +{ >> >> >> + const int val = 255; >> >> >> + uint32_t i, j; >> >> >> + int sd, cnt = 1; >> >> >> + struct packet pckt; >> >> >> + >> >> >> + uint64_t tick; >> >> >> + odp_queue_t queue; >> >> >> + odp_buffer_t buf; >> >> >> + >> >> >> + int thr; >> >> >> + thr = odp_thread_id(); >> >> >> + >> >> >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); >> >> >> + if (sd < 0) { >> >> >> + ODP_ERR("Sender socket open failed\n"); >> >> >> + return -1; >> >> >> + } >> >> >> + >> >> >> + if (setsockopt(sd, SOL_IP, IP_TTL, &val, sizeof(val)) != 0) >> >> >> { >> >> >> + ODP_ERR("Error setting TTL option\n"); >> >> >> + return -1; >> >> >> + } >> >> >> + if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0) { >> >> >> + ODP_ERR("Request for nonblocking I/O failed\n"); >> >> >> + return -1; >> >> >> + } >> >> >> + >> >> >> + /* get the ping queue */ >> >> >> + queue = odp_queue_lookup("ping_timer_queue"); >> >> >> + >> >> >> + for (i = 0; i < PING_CNT; i++) { >> >> >> + /* prepare icmp pkt */ >> >> >> + bzero(&pckt, sizeof(pckt)); >> >> >> + pckt.hdr.type = ICMP_ECHO; >> >> >> + pckt.hdr.un.echo.id = pid; >> >> >> + >> >> >> + for (j = 0; j < sizeof(pckt.msg)-1; j++) >> >> >> + pckt.msg[j] = j+'0'; >> >> >> + >> >> >> + pckt.msg[j] = 0; >> >> >> + pckt.hdr.un.echo.sequence = cnt++; >> >> >> + pckt.hdr.checksum = odp_chksum(&pckt, sizeof(pckt)); >> >> >> + >> >> >> + >> >> >> + /* txmit the pkt */ >> >> >> + if (sendto(sd, &pckt, sizeof(pckt), 0, >> >> >> + (struct sockaddr *)addr, sizeof(*addr)) >> >> >> <= 0) { >> >> >> + ODP_ERR("sendto operation failed msg_cnt >> >> >> [%d]..exiting sender thread\n", i); >> >> >> + return -1; >> >> >> + } >> >> >> + printf(" icmp_sent msg_cnt %d\n", i); >> >> >> + >> >> >> + /* arm the timer */ >> >> >> + tick = odp_timer_current_tick(test_timer_ping); >> >> >> + ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, >> >> >> tick); >> >> >> + >> >> >> + tick += 1000; >> >> >> + test_ping_tmo = >> >> >> odp_timer_absolute_tmo(test_timer_ping, >> >> >> tick, >> >> >> + queue, >> >> >> + >> >> >> ODP_BUFFER_INVALID); >> >> >> + >> >> >> + /* wait for timeout event */ >> >> >> + while ((buf = odp_queue_deq(queue) == >> >> >> ODP_BUFFER_INVALID)) >> >> >> { >> >> >> + /* flag true means ack rxvd.. a cruel hack >> >> >> as I >> >> >> + * am confused on method to get away from >> >> >> while >> >> >> + * loop in case of ack rxvd.. >> >> >> + * FIXME.. >> >> >> + */ >> >> >> + if (ping_sync_flag) { >> >> >> + ping_sync_flag = false; >> >> >> + ODP_DBG(" [%d] done :)!!\n", i); >> >> >> + buf = ODP_BUFFER_INVALID; >> >> >> + break; >> >> >> + } >> >> >> + } >> >> >> + >> >> >> + /* free tmo_buf for timeout case */ >> >> >> + if (buf != ODP_BUFFER_INVALID) { >> >> >> + ODP_DBG(" [%i] timeout msg_cnt [%i] (:-\n", >> >> >> thr, >> >> >> i); >> >> >> + odp_buffer_free(buf); >> >> >> + } >> >> >> + } >> >> >> + >> >> >> + return 0; >> >> >> +} >> >> >> + >> >> >> + >> >> >> +static void *ping_timer_thread(void *arg) >> >> >> +{ >> >> >> + ping_arg_t *parg = (ping_arg_t *)arg; >> >> >> + int thr; >> >> >> + >> >> >> + thr = odp_thread_id(); >> >> >> + >> >> >> + printf("Ping thread %i starts\n", thr); >> >> >> + >> >> >> + switch (parg->thrdarg.testcase) { >> >> >> + case ODP_TIMER_PING_TEST: >> >> >> + if (thr == 1) >> >> >> + if (send_ping_request(&dst_addr) < 0) >> >> >> + parg->result = -1; >> >> >> + if (thr == 2) >> >> >> + if (listen_to_pingack() < 0) >> >> >> + parg->result = -1; >> >> >> + break; >> >> >> + default: >> >> >> + ODP_ERR("Invalid test case [%d]\n", >> >> >> parg->thrdarg.testcase); >> >> >> + } >> >> >> + >> >> >> + >> >> >> + fflush(stdout); >> >> >> + >> >> >> + return parg; >> >> >> +} >> >> >> + >> >> >> +static int ping_init(int count, char *name[]) >> >> >> +{ >> >> >> + struct hostent *hname; >> >> >> + if (count != 2) { >> >> >> + ODP_ERR("usage: %s <hostaddr>\n", name[0]); >> >> >> + return -1; >> >> >> + } >> >> >> + >> >> >> + if (count > 1) { >> >> >> + pid = getpid(); >> >> >> + proto = getprotobyname("ICMP"); >> >> >> + hname = gethostbyname(name[1]); >> >> >> + bzero(&dst_addr, sizeof(dst_addr)); >> >> >> + dst_addr.sin_family = hname->h_addrtype; >> >> >> + dst_addr.sin_port = 0; >> >> >> + dst_addr.sin_addr.s_addr = *(long *)hname->h_addr; >> >> >> + } >> >> >> + printf("ping to addr %s\n", name[1]); >> >> >> + >> >> >> + return 0; >> >> >> +} >> >> >> + >> >> >> + >> >> >> +int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) >> >> >> +{ >> >> >> + ping_arg_t pingarg; >> >> >> + odp_queue_t queue; >> >> >> + odp_buffer_pool_t pool; >> >> >> + void *pool_base; >> >> >> + >> >> >> + if (odp_test_global_init() != 0) >> >> >> + return -1; >> >> >> + >> >> >> + odp_print_system_info(); >> >> >> + >> >> >> + if (ping_init(argc, argv) != 0) >> >> >> + return -1; >> >> >> + >> >> >> + /* >> >> >> + * Create message pool >> >> >> + */ >> >> >> + pool_base = odp_shm_reserve("msg_pool", >> >> >> + MSG_POOL_SIZE, >> >> >> ODP_CACHE_LINE_SIZE); >> >> >> + >> >> >> + pool = odp_buffer_pool_create("msg_pool", pool_base, >> >> >> MSG_POOL_SIZE, >> >> >> + BUF_SIZE, >> >> >> + ODP_CACHE_LINE_SIZE, >> >> >> + ODP_BUFFER_TYPE_RAW); >> >> >> + if (pool == ODP_BUFFER_POOL_INVALID) { >> >> >> + ODP_ERR("Pool create failed.\n"); >> >> >> + return -1; >> >> >> + } >> >> >> + >> >> >> + /* >> >> >> + * Create a queue for timer test >> >> >> + */ >> >> >> + queue = odp_queue_create("ping_timer_queue", >> >> >> ODP_QUEUE_TYPE_SCHED, >> >> >> + NULL); >> >> >> + >> >> >> + if (queue == ODP_QUEUE_INVALID) { >> >> >> + ODP_ERR("Timer queue create failed.\n"); >> >> >> + return -1; >> >> >> + } >> >> >> + >> >> >> + test_timer_ping = odp_timer_create("ping_timer", pool, >> >> >> + 1000000, 1000000, >> >> >> 1000000000000); >> >> >> + odp_shm_print_all(); >> >> >> + >> >> >> + pingarg.thrdarg.testcase = ODP_TIMER_PING_TEST; >> >> >> + pingarg.thrdarg.numthrds = odp_sys_core_count(); >> >> >> + >> >> >> + pingarg.result = 0; >> >> >> + >> >> >> + /* Create and launch worker threads */ >> >> >> + odp_test_thread_create(ping_timer_thread, (pthrd_arg >> >> >> *)&pingarg); >> >> >> + >> >> >> + /* Wait for worker threads to exit */ >> >> >> + odp_test_thread_exit(&pingarg.thrdarg); >> >> >> + >> >> >> + ODP_DBG("ping timer test %s\n", (pingarg.result == 0) ? >> >> >> "passed" : >> >> >> "failed"); >> >> >> + >> >> >> + printf("ODP ping timer test complete\n\n"); >> >> >> + >> >> >> + return 0; >> >> >> +} >> >> >> + >> > >> > This is the newline that creates the warning. >> > >> > Cheers, >> > Anders >> > >> >> >> -- >> >> >> 1.7.9.5 >> >> >> >> >> >> -- >> >> >> You received this message because you are subscribed to the Google >> >> >> Groups >> >> >> "LNG ODP Sub-team - lng-odp@linaro.org" group. >> >> >> To unsubscribe from this group and stop receiving emails from it, >> >> >> send an >> >> >> email to lng-odp+unsubscribe@linaro.org. >> >> >> To post to this group, send email to lng-odp@linaro.org. >> >> >> Visit this group at >> >> >> http://groups.google.com/a/linaro.org/group/lng-odp/. >> >> >> To view this discussion on the web visit >> >> >> >> >> >> https://groups.google.com/a/linaro.org/d/msgid/lng-odp/1396061790-26705-2-git-send-email-santosh.shukla%40linaro.org. >> >> >> For more options, visit >> >> >> https://groups.google.com/a/linaro.org/d/optout. >> >> > >> >> > >> >> -- >> You received this message because you are subscribed to the Google Groups >> "LNG ODP Sub-team - lng-odp@linaro.org" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to lng-odp+unsubscribe@linaro.org. >> To post to this group, send email to lng-odp@linaro.org. >> Visit this group at http://groups.google.com/a/linaro.org/group/lng-odp/. >> To view this discussion on the web visit >> https://groups.google.com/a/linaro.org/d/msgid/lng-odp/CA%2BiXiiOuDS9aQxgiBEv2oFk3_i8pg%3DxnVSAPj-te9bx7c9psGg%40mail.gmail.com. >> >> For more options, visit https://groups.google.com/a/linaro.org/d/optout. > >
For those using emacs, the following is recommended in the .emacs file: (defun linux-c-mode () "C mode with adjusted defaults for use with the Linux kernel." (interactive) (c-mode) (c-set-style "K&R") (setq c-basic-offset 8)) Bill On Tue, Apr 1, 2014 at 4:01 AM, Santosh Shukla <santosh.shukla@linaro.org>wrote: > On 1 April 2014 13:16, Ciprian Barbu <ciprian.barbu@linaro.org> wrote: > > If helpful, I am using this in my .vimrc > > > > set listchars=eol:$,tab:>-,trail:~,extends:>,precedes:<,nbsp:_ > > > > and use > > :set list > > :set nolist > > to enable and disable highlighting them. You can also add "set list" to > your > > vimrc, but I don't like that. Here is more stuff on that: > > > > http://vim.wikia.com/wiki/Highlight_unwanted_spaces > > Thanks Ciprian, those are helpful for me. I do have vim check for > whitespaces and above addition a good extention in .vimrc for me. > > > > > > On Tue, Apr 1, 2014 at 12:38 AM, Santosh Shukla < > santosh.shukla@linaro.org> > > wrote: > >> > >> On 31 March 2014 13:41, Anders Roxell <anders.roxell@linaro.org> wrote: > >> > On 2014-03-31 12:17, Santosh Shukla wrote: > >> >> On 31 March 2014 06:56, Anders Roxell <anders.roxell@linaro.org> > wrote: > >> >> > > >> >> > > >> >> > > >> >> > On 29 March 2014 03:56, Santosh Shukla <santosh.shukla@linaro.org> > >> >> > wrote: > >> >> >> > >> >> >> From: santosh shukla <santosh.shukla@linaro.org> > >> >> >> > >> >> >> Application open PF_INET socket, spawns two thread, > >> >> >> one is sender_ping_thr another one listen_thr. > >> >> >> Each send request arms timer for absolute timeout duration > >> >> >> Whenever listner thread recieves ack, it cancels the timer_out > >> >> >> and free the timeout buffer i.e. tmo_buf allocate while arming.. > >> >> >> Otherwise timeout-event-notfier will enqueue time out even to > >> >> >> queue for that pckt_cnt. > >> >> >> > >> >> >> Signed-off-by: santosh shukla <santosh.shukla@linaro.org> > >> >> >> --- > >> >> >> V2 change : > >> >> >> - incorporated style comment in patch > >> >> >> - odp queue based socket api need more changes specific > >> >> >> to flag setting like socket flag, socket type, parameterising > >> >> >> setsockopt > >> >> >> this program need flags i.e..SOL_IP, IP_TTL etc,, > >> >> >> At this point my initial effort says it will take little more time > >> >> >> to get other parameter support in pktio socket param in odp > >> >> >> therefore I suggest that this could be todo and seubsequent patch > >> >> >> to include qeueue-base-socket method as and when I manage solve > >> >> >> socket parameter problem for this application. > >> >> >> > >> >> >> V3 change : > >> >> >> - Removed git am -3 <patch> warning. > >> >> > > >> >> > > >> >> > This is not the solution, you need to remove the trailing newline > in: > >> >> > test/api_test/odp_timer_ping.c > >> >> > > >> >> > >> >> Okay, But I dont find trailing newline.. Checkpatch doesn't inform > >> >> me,, neither git am . Do you have method or vi editor setting which > >> >> helps to know trailing newline?? > >> > > >> > I saw it in my email reader (mutt), I tried to read it in gmail as > well > >> > and saw it there as well, you can use git to see it also. > >> > git am patch > >> > git show <hash with the warning> > >> > > >> > >> Not good enough to understand trailing newline from above guideline. > >> Trailing newline at the end of patch (in my case) shown as a single > >> patch if its wrong then I expected tool to warnon for me and also > >> while applying patch i.e.. git am throws warning, could be a valid > >> concern to remove those warning, Both cases are just fine in this > >> case. > >> > >> I could still remove tailend newline but knowing a better way in > >> future would help to avoid this discussion. > >> > >> Anyways, I will remove those tailend newline in patch. Thanks. > >> > >> > I'm using vim as my editor, ":set number" the row numbers > >> > > >> > However, I'm unsure if the editor will help you, maybe. > >> > > >> > I've highlighted "problematic" newline see further down > >> > > >> >> > >> >> > Cheers, > >> >> > Anders > >> >> > > >> >> >> > >> >> >> > >> >> >> test/api_test/Makefile | 16 +- > >> >> >> test/api_test/odp_common.h | 1 + > >> >> >> test/api_test/odp_timer_ping.c | 335 > >> >> >> ++++++++++++++++++++++++++++++++++++++++ > >> >> >> 3 files changed, 350 insertions(+), 2 deletions(-) > >> >> >> create mode 100644 test/api_test/odp_timer_ping.c > >> >> >> > >> >> >> diff --git a/test/api_test/Makefile b/test/api_test/Makefile > >> >> >> index bd99c50..0398cd2 100644 > >> >> >> --- a/test/api_test/Makefile > >> >> >> +++ b/test/api_test/Makefile > >> >> >> @@ -11,6 +11,7 @@ ODP_ROOT = ../.. > >> >> >> ODP_ATOMIC = odp_atomic > >> >> >> ODP_SHM = odp_shm > >> >> >> ODP_RING = odp_ring > >> >> >> +ODP_TIM = odp_timer > >> >> >> > >> >> >> include $(ODP_ROOT)/Makefile.inc > >> >> >> include ../Makefile.inc > >> >> >> @@ -32,13 +33,18 @@ RING_OBJS = > >> >> >> RING_OBJS += $(OBJ_DIR)/odp_common.o > >> >> >> RING_OBJS += $(OBJ_DIR)/odp_ring_test.o > >> >> >> > >> >> >> -DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) > >> >> >> $(RING_OBJS:.o=.d) > >> >> >> +TIM_OBJS = > >> >> >> +TIM_OBJS += $(OBJ_DIR)/odp_common.o > >> >> >> +TIM_OBJS += $(OBJ_DIR)/odp_timer_ping.o > >> >> >> + > >> >> >> +DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) > >> >> >> $(RING_OBJS:.o=.d) > >> >> >> $(TIM_OBJS:.o=.d) > >> >> >> > >> >> >> .PHONY: all > >> >> >> -all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) > >> >> >> +all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) $(ODP_TIM) > >> >> >> atomic: $(OBJ_DIR) $(ODP_ATOMIC) > >> >> >> shm: $(OBJ_DIR) $(ODP_SHM) > >> >> >> ring: $(OBJ_DIR) $(ODP_RING) > >> >> >> +timer: $(OBJ_DIR) $(ODP_TIM) > >> >> >> > >> >> >> -include $(DEPS) > >> >> >> > >> >> >> @@ -64,12 +70,17 @@ $(ODP_RING): $(ODP_LIB) $(RING_OBJS) > >> >> >> $(ECHO) Linking $< > >> >> >> $(CC) $(LDFLAGS) $(RING_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ > >> >> >> > >> >> >> +$(ODP_TIM): $(ODP_LIB) $(TIM_OBJS) > >> >> >> + $(ECHO) Linking $< > >> >> >> + $(CC) $(LDFLAGS) $(TIM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ > >> >> >> + > >> >> >> .PHONY: clean > >> >> >> clean: > >> >> >> $(RMDIR) $(OBJ_DIR) > >> >> >> $(RM) $(ODP_ATOMIC) > >> >> >> $(RM) $(ODP_SHM) > >> >> >> $(RM) $(ODP_RING) > >> >> >> + $(RM) $(ODP_TIM) > >> >> >> $(MAKE) -C $(ODP_DIR) clean > >> >> >> > >> >> >> .PHONY: install > >> >> >> @@ -78,3 +89,4 @@ install: > >> >> >> install -m 0755 $(ODP_ATOMIC) $(DESTDIR)/share/odp/ > >> >> >> install -m 0755 $(ODP_SHM) $(DESTDIR)/share/odp/ > >> >> >> install -m 0755 $(ODP_RING) $(DESTDIR)/share/odp/ > >> >> >> + install -m 0755 $(ODP_TIM) $(DESTDIR)/share/odp/ > >> >> >> diff --git a/test/api_test/odp_common.h > b/test/api_test/odp_common.h > >> >> >> index e8201ac..f5183e1 100644 > >> >> >> --- a/test/api_test/odp_common.h > >> >> >> +++ b/test/api_test/odp_common.h > >> >> >> @@ -20,6 +20,7 @@ typedef enum { > >> >> >> ODP_SHM_TEST, > >> >> >> ODP_RING_TEST_BASIC, > >> >> >> ODP_RING_TEST_STRESS, > >> >> >> + ODP_TIMER_PING_TEST, > >> >> >> ODP_MAX_TEST > >> >> >> } odp_test_case_e; > >> >> >> > >> >> >> diff --git a/test/api_test/odp_timer_ping.c > >> >> >> b/test/api_test/odp_timer_ping.c > >> >> >> new file mode 100644 > >> >> >> index 0000000..c1abc27 > >> >> >> --- /dev/null > >> >> >> +++ b/test/api_test/odp_timer_ping.c > >> >> >> @@ -0,0 +1,335 @@ > >> >> >> +/* Copyright (c) 2014, Linaro Limited > >> >> >> + * All rights reserved. > >> >> >> + * > >> >> >> + * SPDX-License-Identifier: BSD-3-Clause > >> >> >> + */ > >> >> >> + > >> >> >> + > >> >> >> +/** > >> >> >> + * @file > >> >> >> + * > >> >> >> + * ODP timer ping example application. > >> >> >> + * application open PF_INET socket, every ping send request > >> >> >> + * will arm timer for some duration, if ping_ack rxvd with > >> >> >> + * time band.. listen thread will cancel timer and free the > >> >> >> + * tmo_buffer.. otherwise timer expiration event will exit > >> >> >> + * application lead to test failure.. > >> >> >> + * - two thread used, one listener other one sender. > >> >> >> + * - run ./odp_timer <ipadder> > >> >> >> + * In ubuntu, you need run using sudo ./odp_timer <ipaddr> > >> >> >> + * - so to tigger timeout explicitly.. ping with badipaddr > >> >> >> + * Otherwise timeout may happen bcz of slow nw speed > >> >> >> + */ > >> >> >> + > >> >> >> + > >> >> >> +#include <unistd.h> > >> >> >> +#include <fcntl.h> > >> >> >> +#include <errno.h> > >> >> >> +#include <sys/socket.h> > >> >> >> +#include <resolv.h> > >> >> >> +#include <netdb.h> > >> >> >> +#include <netinet/in.h> > >> >> >> +#include <netinet/ip_icmp.h> > >> >> >> +#include <arpa/inet.h> > >> >> >> + > >> >> >> +#include <string.h> > >> >> >> +#include <odp.h> > >> >> >> +#include <odp_common.h> > >> >> >> +#include <odp_timer.h> > >> >> >> +#include <helper/odp_chksum.h> > >> >> >> + > >> >> >> +#define MSG_POOL_SIZE (4*1024*1024) > >> >> >> +#define BUF_SIZE 8 > >> >> >> +#define PING_CNT 10 > >> >> >> + > >> >> >> + > >> >> >> +static odp_timer_t test_timer_ping; > >> >> >> +static odp_timer_tmo_t test_ping_tmo; > >> >> >> + > >> >> >> +#define PKTSIZE 64 > >> >> >> +struct packet { > >> >> >> + struct icmphdr hdr; > >> >> >> + char msg[PKTSIZE-sizeof(struct icmphdr)]; > >> >> >> +}; > >> >> >> + > >> >> >> +int pid = -1; > >> >> >> +struct protoent *proto; > >> >> >> + > >> >> >> +struct sockaddr_in dst_addr; > >> >> >> + > >> >> >> +/* local struct for ping_timer_thread argument */ > >> >> >> +typedef struct { > >> >> >> + pthrd_arg thrdarg; > >> >> >> + int result; > >> >> >> +} ping_arg_t; > >> >> >> + > >> >> >> +static int ping_sync_flag; > >> >> >> + > >> >> >> + > >> >> >> +static void dump_icmp_pkt(void *buf, int bytes, int pkt_cnt) > >> >> >> +{ > >> >> >> + int i; > >> >> >> + struct iphdr *ip = buf; > >> >> >> + > >> >> >> + ODP_DBG("---dump icmp pkt_cnt %d------\n", pkt_cnt); > >> >> >> + for (i = 0; i < bytes; i++) { > >> >> >> + if (!(i & 15)) > >> >> >> + ODP_DBG("\n %x: ", i); > >> >> >> + ODP_DBG("%d ", ((unsigned char *)buf)[i]); > >> >> >> + } > >> >> >> + ODP_DBG("\n"); > >> >> >> + char addrstr[INET6_ADDRSTRLEN]; > >> >> >> + inet_ntop(AF_INET, &ip->daddr, addrstr, sizeof(addrstr)); > >> >> >> + ODP_DBG("byte %d, Ack rxvd for msg_cnt [%d] from %s\n", > >> >> >> bytes, > >> >> >> pkt_cnt, addrstr); > >> >> >> +} > >> >> >> + > >> >> >> + > >> >> >> +static int listen_to_pingack(void) > >> >> >> +{ > >> >> >> + int sd, i; > >> >> >> + struct sockaddr_in addr; > >> >> >> + unsigned char buf[1024]; > >> >> >> + int bytes, len; > >> >> >> + > >> >> >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); > >> >> >> + if (sd < 0) { > >> >> >> + ODP_ERR("Listener socket open failed\n"); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + > >> >> >> + for (i = 0; i < PING_CNT; i++) { > >> >> >> + len = sizeof(addr); > >> >> >> + > >> >> >> + bzero(buf, sizeof(buf)); > >> >> >> + bytes = recvfrom(sd, buf, sizeof(buf), 0, > >> >> >> + (struct sockaddr *)&addr, > >> >> >> + (socklen_t *)&len); > >> >> >> + if (bytes > 0) { > >> >> >> + /* pkt rxvd therefore cancel the timeout > */ > >> >> >> + if (odp_timer_cancel_tmo(test_timer_ping, > >> >> >> + test_ping_tmo) != > >> >> >> 0) { > >> >> >> + ODP_ERR("cancel_tmo failed > ..exiting > >> >> >> listner thread\n"); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + > >> >> >> + /* cruel bad hack used for sender, listner > >> >> >> ipc.. > >> >> >> + * euwww.. FIXME .. > >> >> >> + */ > >> >> >> + ping_sync_flag = true; > >> >> >> + > >> >> >> + odp_buffer_free(test_ping_tmo); > >> >> >> + > >> >> >> + dump_icmp_pkt(buf, bytes, i); > >> >> >> + } else { > >> >> >> + ODP_ERR("recvfrom operation failed for > >> >> >> msg_cnt > >> >> >> [%d]\n", i); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + } > >> >> >> + > >> >> >> + return 0; > >> >> >> +} > >> >> >> + > >> >> >> + > >> >> >> +static int send_ping_request(struct sockaddr_in *addr) > >> >> >> +{ > >> >> >> + const int val = 255; > >> >> >> + uint32_t i, j; > >> >> >> + int sd, cnt = 1; > >> >> >> + struct packet pckt; > >> >> >> + > >> >> >> + uint64_t tick; > >> >> >> + odp_queue_t queue; > >> >> >> + odp_buffer_t buf; > >> >> >> + > >> >> >> + int thr; > >> >> >> + thr = odp_thread_id(); > >> >> >> + > >> >> >> + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); > >> >> >> + if (sd < 0) { > >> >> >> + ODP_ERR("Sender socket open failed\n"); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + > >> >> >> + if (setsockopt(sd, SOL_IP, IP_TTL, &val, sizeof(val)) != > 0) > >> >> >> { > >> >> >> + ODP_ERR("Error setting TTL option\n"); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0) { > >> >> >> + ODP_ERR("Request for nonblocking I/O failed\n"); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + > >> >> >> + /* get the ping queue */ > >> >> >> + queue = odp_queue_lookup("ping_timer_queue"); > >> >> >> + > >> >> >> + for (i = 0; i < PING_CNT; i++) { > >> >> >> + /* prepare icmp pkt */ > >> >> >> + bzero(&pckt, sizeof(pckt)); > >> >> >> + pckt.hdr.type = ICMP_ECHO; > >> >> >> + pckt.hdr.un.echo.id = pid; > >> >> >> + > >> >> >> + for (j = 0; j < sizeof(pckt.msg)-1; j++) > >> >> >> + pckt.msg[j] = j+'0'; > >> >> >> + > >> >> >> + pckt.msg[j] = 0; > >> >> >> + pckt.hdr.un.echo.sequence = cnt++; > >> >> >> + pckt.hdr.checksum = odp_chksum(&pckt, > sizeof(pckt)); > >> >> >> + > >> >> >> + > >> >> >> + /* txmit the pkt */ > >> >> >> + if (sendto(sd, &pckt, sizeof(pckt), 0, > >> >> >> + (struct sockaddr *)addr, sizeof(*addr)) > >> >> >> <= 0) { > >> >> >> + ODP_ERR("sendto operation failed msg_cnt > >> >> >> [%d]..exiting sender thread\n", i); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + printf(" icmp_sent msg_cnt %d\n", i); > >> >> >> + > >> >> >> + /* arm the timer */ > >> >> >> + tick = odp_timer_current_tick(test_timer_ping); > >> >> >> + ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, > >> >> >> tick); > >> >> >> + > >> >> >> + tick += 1000; > >> >> >> + test_ping_tmo = > >> >> >> odp_timer_absolute_tmo(test_timer_ping, > >> >> >> tick, > >> >> >> + queue, > >> >> >> + > >> >> >> ODP_BUFFER_INVALID); > >> >> >> + > >> >> >> + /* wait for timeout event */ > >> >> >> + while ((buf = odp_queue_deq(queue) == > >> >> >> ODP_BUFFER_INVALID)) > >> >> >> { > >> >> >> + /* flag true means ack rxvd.. a cruel hack > >> >> >> as I > >> >> >> + * am confused on method to get away from > >> >> >> while > >> >> >> + * loop in case of ack rxvd.. > >> >> >> + * FIXME.. > >> >> >> + */ > >> >> >> + if (ping_sync_flag) { > >> >> >> + ping_sync_flag = false; > >> >> >> + ODP_DBG(" [%d] done :)!!\n", i); > >> >> >> + buf = ODP_BUFFER_INVALID; > >> >> >> + break; > >> >> >> + } > >> >> >> + } > >> >> >> + > >> >> >> + /* free tmo_buf for timeout case */ > >> >> >> + if (buf != ODP_BUFFER_INVALID) { > >> >> >> + ODP_DBG(" [%i] timeout msg_cnt [%i] > (:-\n", > >> >> >> thr, > >> >> >> i); > >> >> >> + odp_buffer_free(buf); > >> >> >> + } > >> >> >> + } > >> >> >> + > >> >> >> + return 0; > >> >> >> +} > >> >> >> + > >> >> >> + > >> >> >> +static void *ping_timer_thread(void *arg) > >> >> >> +{ > >> >> >> + ping_arg_t *parg = (ping_arg_t *)arg; > >> >> >> + int thr; > >> >> >> + > >> >> >> + thr = odp_thread_id(); > >> >> >> + > >> >> >> + printf("Ping thread %i starts\n", thr); > >> >> >> + > >> >> >> + switch (parg->thrdarg.testcase) { > >> >> >> + case ODP_TIMER_PING_TEST: > >> >> >> + if (thr == 1) > >> >> >> + if (send_ping_request(&dst_addr) < 0) > >> >> >> + parg->result = -1; > >> >> >> + if (thr == 2) > >> >> >> + if (listen_to_pingack() < 0) > >> >> >> + parg->result = -1; > >> >> >> + break; > >> >> >> + default: > >> >> >> + ODP_ERR("Invalid test case [%d]\n", > >> >> >> parg->thrdarg.testcase); > >> >> >> + } > >> >> >> + > >> >> >> + > >> >> >> + fflush(stdout); > >> >> >> + > >> >> >> + return parg; > >> >> >> +} > >> >> >> + > >> >> >> +static int ping_init(int count, char *name[]) > >> >> >> +{ > >> >> >> + struct hostent *hname; > >> >> >> + if (count != 2) { > >> >> >> + ODP_ERR("usage: %s <hostaddr>\n", name[0]); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + > >> >> >> + if (count > 1) { > >> >> >> + pid = getpid(); > >> >> >> + proto = getprotobyname("ICMP"); > >> >> >> + hname = gethostbyname(name[1]); > >> >> >> + bzero(&dst_addr, sizeof(dst_addr)); > >> >> >> + dst_addr.sin_family = hname->h_addrtype; > >> >> >> + dst_addr.sin_port = 0; > >> >> >> + dst_addr.sin_addr.s_addr = *(long *)hname->h_addr; > >> >> >> + } > >> >> >> + printf("ping to addr %s\n", name[1]); > >> >> >> + > >> >> >> + return 0; > >> >> >> +} > >> >> >> + > >> >> >> + > >> >> >> +int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) > >> >> >> +{ > >> >> >> + ping_arg_t pingarg; > >> >> >> + odp_queue_t queue; > >> >> >> + odp_buffer_pool_t pool; > >> >> >> + void *pool_base; > >> >> >> + > >> >> >> + if (odp_test_global_init() != 0) > >> >> >> + return -1; > >> >> >> + > >> >> >> + odp_print_system_info(); > >> >> >> + > >> >> >> + if (ping_init(argc, argv) != 0) > >> >> >> + return -1; > >> >> >> + > >> >> >> + /* > >> >> >> + * Create message pool > >> >> >> + */ > >> >> >> + pool_base = odp_shm_reserve("msg_pool", > >> >> >> + MSG_POOL_SIZE, > >> >> >> ODP_CACHE_LINE_SIZE); > >> >> >> + > >> >> >> + pool = odp_buffer_pool_create("msg_pool", pool_base, > >> >> >> MSG_POOL_SIZE, > >> >> >> + BUF_SIZE, > >> >> >> + ODP_CACHE_LINE_SIZE, > >> >> >> + ODP_BUFFER_TYPE_RAW); > >> >> >> + if (pool == ODP_BUFFER_POOL_INVALID) { > >> >> >> + ODP_ERR("Pool create failed.\n"); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + > >> >> >> + /* > >> >> >> + * Create a queue for timer test > >> >> >> + */ > >> >> >> + queue = odp_queue_create("ping_timer_queue", > >> >> >> ODP_QUEUE_TYPE_SCHED, > >> >> >> + NULL); > >> >> >> + > >> >> >> + if (queue == ODP_QUEUE_INVALID) { > >> >> >> + ODP_ERR("Timer queue create failed.\n"); > >> >> >> + return -1; > >> >> >> + } > >> >> >> + > >> >> >> + test_timer_ping = odp_timer_create("ping_timer", pool, > >> >> >> + 1000000, 1000000, > >> >> >> 1000000000000); > >> >> >> + odp_shm_print_all(); > >> >> >> + > >> >> >> + pingarg.thrdarg.testcase = ODP_TIMER_PING_TEST; > >> >> >> + pingarg.thrdarg.numthrds = odp_sys_core_count(); > >> >> >> + > >> >> >> + pingarg.result = 0; > >> >> >> + > >> >> >> + /* Create and launch worker threads */ > >> >> >> + odp_test_thread_create(ping_timer_thread, (pthrd_arg > >> >> >> *)&pingarg); > >> >> >> + > >> >> >> + /* Wait for worker threads to exit */ > >> >> >> + odp_test_thread_exit(&pingarg.thrdarg); > >> >> >> + > >> >> >> + ODP_DBG("ping timer test %s\n", (pingarg.result == 0) ? > >> >> >> "passed" : > >> >> >> "failed"); > >> >> >> + > >> >> >> + printf("ODP ping timer test complete\n\n"); > >> >> >> + > >> >> >> + return 0; > >> >> >> +} > >> >> >> + > >> > > >> > This is the newline that creates the warning. > >> > > >> > Cheers, > >> > Anders > >> > > >> >> >> -- > >> >> >> 1.7.9.5 > >> >> >> > >> >> >> -- > >> >> >> You received this message because you are subscribed to the Google > >> >> >> Groups > >> >> >> "LNG ODP Sub-team - lng-odp@linaro.org" group. > >> >> >> To unsubscribe from this group and stop receiving emails from it, > >> >> >> send an > >> >> >> email to lng-odp+unsubscribe@linaro.org. > >> >> >> To post to this group, send email to lng-odp@linaro.org. > >> >> >> Visit this group at > >> >> >> http://groups.google.com/a/linaro.org/group/lng-odp/. > >> >> >> To view this discussion on the web visit > >> >> >> > >> >> >> > https://groups.google.com/a/linaro.org/d/msgid/lng-odp/1396061790-26705-2-git-send-email-santosh.shukla%40linaro.org > . > >> >> >> For more options, visit > >> >> >> https://groups.google.com/a/linaro.org/d/optout. > >> >> > > >> >> > > >> > >> -- > >> You received this message because you are subscribed to the Google > Groups > >> "LNG ODP Sub-team - lng-odp@linaro.org" group. > >> To unsubscribe from this group and stop receiving emails from it, send > an > >> email to lng-odp+unsubscribe@linaro.org. > >> To post to this group, send email to lng-odp@linaro.org. > >> Visit this group at > http://groups.google.com/a/linaro.org/group/lng-odp/. > >> To view this discussion on the web visit > >> > https://groups.google.com/a/linaro.org/d/msgid/lng-odp/CA%2BiXiiOuDS9aQxgiBEv2oFk3_i8pg%3DxnVSAPj-te9bx7c9psGg%40mail.gmail.com > . > >> > >> For more options, visit https://groups.google.com/a/linaro.org/d/optout > . > > > > > > -- > You received this message because you are subscribed to the Google Groups > "LNG ODP Sub-team - lng-odp@linaro.org" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to lng-odp+unsubscribe@linaro.org. > To post to this group, send email to lng-odp@linaro.org. > Visit this group at http://groups.google.com/a/linaro.org/group/lng-odp/. > To view this discussion on the web visit > https://groups.google.com/a/linaro.org/d/msgid/lng-odp/CA%2BiXiiOadeJE3iLwehWgZgNhK8Bxppoh683%3DYLpS%2BK4at%2BcVdQ%40mail.gmail.com > . > For more options, visit https://groups.google.com/a/linaro.org/d/optout. >
diff --git a/test/api_test/Makefile b/test/api_test/Makefile index bd99c50..0398cd2 100644 --- a/test/api_test/Makefile +++ b/test/api_test/Makefile @@ -11,6 +11,7 @@ ODP_ROOT = ../.. ODP_ATOMIC = odp_atomic ODP_SHM = odp_shm ODP_RING = odp_ring +ODP_TIM = odp_timer include $(ODP_ROOT)/Makefile.inc include ../Makefile.inc @@ -32,13 +33,18 @@ RING_OBJS = RING_OBJS += $(OBJ_DIR)/odp_common.o RING_OBJS += $(OBJ_DIR)/odp_ring_test.o -DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) +TIM_OBJS = +TIM_OBJS += $(OBJ_DIR)/odp_common.o +TIM_OBJS += $(OBJ_DIR)/odp_timer_ping.o + +DEPS = $(ATOMIC_OBJS:.o=.d) $(SHM_OBJS:.o=.d) $(RING_OBJS:.o=.d) $(TIM_OBJS:.o=.d) .PHONY: all -all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) +all: $(OBJ_DIR) $(ODP_ATOMIC) $(ODP_SHM) $(ODP_RING) $(ODP_TIM) atomic: $(OBJ_DIR) $(ODP_ATOMIC) shm: $(OBJ_DIR) $(ODP_SHM) ring: $(OBJ_DIR) $(ODP_RING) +timer: $(OBJ_DIR) $(ODP_TIM) -include $(DEPS) @@ -64,12 +70,17 @@ $(ODP_RING): $(ODP_LIB) $(RING_OBJS) $(ECHO) Linking $< $(CC) $(LDFLAGS) $(RING_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ +$(ODP_TIM): $(ODP_LIB) $(TIM_OBJS) + $(ECHO) Linking $< + $(CC) $(LDFLAGS) $(TIM_OBJS) $(ODP_LIB) $(STD_LIBS) -o $@ + .PHONY: clean clean: $(RMDIR) $(OBJ_DIR) $(RM) $(ODP_ATOMIC) $(RM) $(ODP_SHM) $(RM) $(ODP_RING) + $(RM) $(ODP_TIM) $(MAKE) -C $(ODP_DIR) clean .PHONY: install @@ -78,3 +89,4 @@ install: install -m 0755 $(ODP_ATOMIC) $(DESTDIR)/share/odp/ install -m 0755 $(ODP_SHM) $(DESTDIR)/share/odp/ install -m 0755 $(ODP_RING) $(DESTDIR)/share/odp/ + install -m 0755 $(ODP_TIM) $(DESTDIR)/share/odp/ diff --git a/test/api_test/odp_common.h b/test/api_test/odp_common.h index e8201ac..f5183e1 100644 --- a/test/api_test/odp_common.h +++ b/test/api_test/odp_common.h @@ -20,6 +20,7 @@ typedef enum { ODP_SHM_TEST, ODP_RING_TEST_BASIC, ODP_RING_TEST_STRESS, + ODP_TIMER_PING_TEST, ODP_MAX_TEST } odp_test_case_e; diff --git a/test/api_test/odp_timer_ping.c b/test/api_test/odp_timer_ping.c new file mode 100644 index 0000000..c1abc27 --- /dev/null +++ b/test/api_test/odp_timer_ping.c @@ -0,0 +1,335 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP timer ping example application. + * application open PF_INET socket, every ping send request + * will arm timer for some duration, if ping_ack rxvd with + * time band.. listen thread will cancel timer and free the + * tmo_buffer.. otherwise timer expiration event will exit + * application lead to test failure.. + * - two thread used, one listener other one sender. + * - run ./odp_timer <ipadder> + * In ubuntu, you need run using sudo ./odp_timer <ipaddr> + * - so to tigger timeout explicitly.. ping with badipaddr + * Otherwise timeout may happen bcz of slow nw speed + */ + + +#include <unistd.h> +#include <fcntl.h> +#include <errno.h> +#include <sys/socket.h> +#include <resolv.h> +#include <netdb.h> +#include <netinet/in.h> +#include <netinet/ip_icmp.h> +#include <arpa/inet.h> + +#include <string.h> +#include <odp.h> +#include <odp_common.h> +#include <odp_timer.h> +#include <helper/odp_chksum.h> + +#define MSG_POOL_SIZE (4*1024*1024) +#define BUF_SIZE 8 +#define PING_CNT 10 + + +static odp_timer_t test_timer_ping; +static odp_timer_tmo_t test_ping_tmo; + +#define PKTSIZE 64 +struct packet { + struct icmphdr hdr; + char msg[PKTSIZE-sizeof(struct icmphdr)]; +}; + +int pid = -1; +struct protoent *proto; + +struct sockaddr_in dst_addr; + +/* local struct for ping_timer_thread argument */ +typedef struct { + pthrd_arg thrdarg; + int result; +} ping_arg_t; + +static int ping_sync_flag; + + +static void dump_icmp_pkt(void *buf, int bytes, int pkt_cnt) +{ + int i; + struct iphdr *ip = buf; + + ODP_DBG("---dump icmp pkt_cnt %d------\n", pkt_cnt); + for (i = 0; i < bytes; i++) { + if (!(i & 15)) + ODP_DBG("\n %x: ", i); + ODP_DBG("%d ", ((unsigned char *)buf)[i]); + } + ODP_DBG("\n"); + char addrstr[INET6_ADDRSTRLEN]; + inet_ntop(AF_INET, &ip->daddr, addrstr, sizeof(addrstr)); + ODP_DBG("byte %d, Ack rxvd for msg_cnt [%d] from %s\n", bytes, pkt_cnt, addrstr); +} + + +static int listen_to_pingack(void) +{ + int sd, i; + struct sockaddr_in addr; + unsigned char buf[1024]; + int bytes, len; + + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); + if (sd < 0) { + ODP_ERR("Listener socket open failed\n"); + return -1; + } + + for (i = 0; i < PING_CNT; i++) { + len = sizeof(addr); + + bzero(buf, sizeof(buf)); + bytes = recvfrom(sd, buf, sizeof(buf), 0, + (struct sockaddr *)&addr, + (socklen_t *)&len); + if (bytes > 0) { + /* pkt rxvd therefore cancel the timeout */ + if (odp_timer_cancel_tmo(test_timer_ping, + test_ping_tmo) != 0) { + ODP_ERR("cancel_tmo failed ..exiting listner thread\n"); + return -1; + } + + /* cruel bad hack used for sender, listner ipc.. + * euwww.. FIXME .. + */ + ping_sync_flag = true; + + odp_buffer_free(test_ping_tmo); + + dump_icmp_pkt(buf, bytes, i); + } else { + ODP_ERR("recvfrom operation failed for msg_cnt [%d]\n", i); + return -1; + } + } + + return 0; +} + + +static int send_ping_request(struct sockaddr_in *addr) +{ + const int val = 255; + uint32_t i, j; + int sd, cnt = 1; + struct packet pckt; + + uint64_t tick; + odp_queue_t queue; + odp_buffer_t buf; + + int thr; + thr = odp_thread_id(); + + sd = socket(PF_INET, SOCK_RAW, proto->p_proto); + if (sd < 0) { + ODP_ERR("Sender socket open failed\n"); + return -1; + } + + if (setsockopt(sd, SOL_IP, IP_TTL, &val, sizeof(val)) != 0) { + ODP_ERR("Error setting TTL option\n"); + return -1; + } + if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0) { + ODP_ERR("Request for nonblocking I/O failed\n"); + return -1; + } + + /* get the ping queue */ + queue = odp_queue_lookup("ping_timer_queue"); + + for (i = 0; i < PING_CNT; i++) { + /* prepare icmp pkt */ + bzero(&pckt, sizeof(pckt)); + pckt.hdr.type = ICMP_ECHO; + pckt.hdr.un.echo.id = pid; + + for (j = 0; j < sizeof(pckt.msg)-1; j++) + pckt.msg[j] = j+'0'; + + pckt.msg[j] = 0; + pckt.hdr.un.echo.sequence = cnt++; + pckt.hdr.checksum = odp_chksum(&pckt, sizeof(pckt)); + + + /* txmit the pkt */ + if (sendto(sd, &pckt, sizeof(pckt), 0, + (struct sockaddr *)addr, sizeof(*addr)) <= 0) { + ODP_ERR("sendto operation failed msg_cnt [%d]..exiting sender thread\n", i); + return -1; + } + printf(" icmp_sent msg_cnt %d\n", i); + + /* arm the timer */ + tick = odp_timer_current_tick(test_timer_ping); + ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, tick); + + tick += 1000; + test_ping_tmo = odp_timer_absolute_tmo(test_timer_ping, tick, + queue, + ODP_BUFFER_INVALID); + + /* wait for timeout event */ + while ((buf = odp_queue_deq(queue) == ODP_BUFFER_INVALID)) { + /* flag true means ack rxvd.. a cruel hack as I + * am confused on method to get away from while + * loop in case of ack rxvd.. + * FIXME.. + */ + if (ping_sync_flag) { + ping_sync_flag = false; + ODP_DBG(" [%d] done :)!!\n", i); + buf = ODP_BUFFER_INVALID; + break; + } + } + + /* free tmo_buf for timeout case */ + if (buf != ODP_BUFFER_INVALID) { + ODP_DBG(" [%i] timeout msg_cnt [%i] (:-\n", thr, i); + odp_buffer_free(buf); + } + } + + return 0; +} + + +static void *ping_timer_thread(void *arg) +{ + ping_arg_t *parg = (ping_arg_t *)arg; + int thr; + + thr = odp_thread_id(); + + printf("Ping thread %i starts\n", thr); + + switch (parg->thrdarg.testcase) { + case ODP_TIMER_PING_TEST: + if (thr == 1) + if (send_ping_request(&dst_addr) < 0) + parg->result = -1; + if (thr == 2) + if (listen_to_pingack() < 0) + parg->result = -1; + break; + default: + ODP_ERR("Invalid test case [%d]\n", parg->thrdarg.testcase); + } + + + fflush(stdout); + + return parg; +} + +static int ping_init(int count, char *name[]) +{ + struct hostent *hname; + if (count != 2) { + ODP_ERR("usage: %s <hostaddr>\n", name[0]); + return -1; + } + + if (count > 1) { + pid = getpid(); + proto = getprotobyname("ICMP"); + hname = gethostbyname(name[1]); + bzero(&dst_addr, sizeof(dst_addr)); + dst_addr.sin_family = hname->h_addrtype; + dst_addr.sin_port = 0; + dst_addr.sin_addr.s_addr = *(long *)hname->h_addr; + } + printf("ping to addr %s\n", name[1]); + + return 0; +} + + +int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) +{ + ping_arg_t pingarg; + odp_queue_t queue; + odp_buffer_pool_t pool; + void *pool_base; + + if (odp_test_global_init() != 0) + return -1; + + odp_print_system_info(); + + if (ping_init(argc, argv) != 0) + return -1; + + /* + * Create message pool + */ + pool_base = odp_shm_reserve("msg_pool", + MSG_POOL_SIZE, ODP_CACHE_LINE_SIZE); + + pool = odp_buffer_pool_create("msg_pool", pool_base, MSG_POOL_SIZE, + BUF_SIZE, + ODP_CACHE_LINE_SIZE, + ODP_BUFFER_TYPE_RAW); + if (pool == ODP_BUFFER_POOL_INVALID) { + ODP_ERR("Pool create failed.\n"); + return -1; + } + + /* + * Create a queue for timer test + */ + queue = odp_queue_create("ping_timer_queue", ODP_QUEUE_TYPE_SCHED, + NULL); + + if (queue == ODP_QUEUE_INVALID) { + ODP_ERR("Timer queue create failed.\n"); + return -1; + } + + test_timer_ping = odp_timer_create("ping_timer", pool, + 1000000, 1000000, 1000000000000); + odp_shm_print_all(); + + pingarg.thrdarg.testcase = ODP_TIMER_PING_TEST; + pingarg.thrdarg.numthrds = odp_sys_core_count(); + + pingarg.result = 0; + + /* Create and launch worker threads */ + odp_test_thread_create(ping_timer_thread, (pthrd_arg *)&pingarg); + + /* Wait for worker threads to exit */ + odp_test_thread_exit(&pingarg.thrdarg); + + ODP_DBG("ping timer test %s\n", (pingarg.result == 0) ? "passed" : "failed"); + + printf("ODP ping timer test complete\n\n"); + + return 0; +} +