From 7f01e9970d211235fc8057de6dc41ba8ceafe795 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 17 Jun 2010 16:51:53 +0200 Subject: stopwatch returned to libzmq --- include/zmq.h | 2 ++ include/zmq_utils.h | 49 ++++++++++++++++++++++++++++++ perf/Makefile.am | 9 +++--- perf/helpers.cpp | 86 ----------------------------------------------------- perf/helpers.h | 40 ------------------------- perf/local_lat.cpp | 4 +-- perf/local_thr.cpp | 6 ++-- perf/remote_lat.cpp | 6 ++-- perf/remote_thr.cpp | 4 +-- src/Makefile.am | 2 +- src/zmq.cpp | 63 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 129 insertions(+), 142 deletions(-) create mode 100644 include/zmq_utils.h delete mode 100644 perf/helpers.cpp delete mode 100644 perf/helpers.h diff --git a/include/zmq.h b/include/zmq.h index 3bf55b6..294b5c4 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -223,6 +223,8 @@ ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout); ZMQ_EXPORT int zmq_device (int device, void * insocket, void* outsocket); +#undef ZMQ_EXPORT + #ifdef __cplusplus } #endif diff --git a/include/zmq_utils.h b/include/zmq_utils.h new file mode 100644 index 0000000..50a50f9 --- /dev/null +++ b/include/zmq_utils.h @@ -0,0 +1,49 @@ +/* + Copyright (c) 2007-2010 iMatix Corporation + + This file is part of 0MQ. + + 0MQ is free software; you can redistribute it and/or modify it under + the terms of the Lesser GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + 0MQ is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + Lesser GNU General Public License for more details. + + You should have received a copy of the Lesser GNU General Public License + along with this program. If not, see . +*/ + +#ifndef __ZMQ_UTILS_H_INCLUDED__ +#define __ZMQ_UTILS_H_INCLUDED__ + +/* Win32 needs special handling for DLL exports */ +#if defined _WIN32 +# if defined DLL_EXPORT +# define ZMQ_EXPORT __declspec(dllexport) +# else +# define ZMQ_EXPORT __declspec(dllimport) +# endif +#else +# define ZMQ_EXPORT +#endif + +/* Helper functions are used by perf tests so that they don't have to care */ +/* about minutiae of time-related functions on different OS platforms. */ + +/* Starts the stopwatch. Returns the handle to the watch. */ +ZMQ_EXPORT void *zmq_stopwatch_start (); + +/* Stops the stopwatch. Returns the number of microseconds elapsed since */ +/* the stopwatch was started. */ +ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_); + +/* Sleeps for specified number of seconds. */ +ZMQ_EXPORT void zmq_sleep (int seconds_); + +#undef ZMQ_EXPORT + +#endif diff --git a/perf/Makefile.am b/perf/Makefile.am index 323c91a..bf3dde9 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -1,16 +1,15 @@ INCLUDES = -I$(top_builddir)/include noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr -EXTRA_DIST = helpers.h local_lat_LDADD = $(top_builddir)/src/libzmq.la -local_lat_SOURCES = local_lat.cpp helpers.cpp +local_lat_SOURCES = local_lat.cpp remote_lat_LDADD = $(top_builddir)/src/libzmq.la -remote_lat_SOURCES = remote_lat.cpp helpers.cpp +remote_lat_SOURCES = remote_lat.cpp local_thr_LDADD = $(top_builddir)/src/libzmq.la -local_thr_SOURCES = local_thr.cpp helpers.cpp +local_thr_SOURCES = local_thr.cpp remote_thr_LDADD = $(top_builddir)/src/libzmq.la -remote_thr_SOURCES = remote_thr.cpp helpers.cpp +remote_thr_SOURCES = remote_thr.cpp diff --git a/perf/helpers.cpp b/perf/helpers.cpp deleted file mode 100644 index 94b653f..0000000 --- a/perf/helpers.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - Copyright (c) 2007-2010 iMatix Corporation - - This file is part of 0MQ. - - 0MQ is free software; you can redistribute it and/or modify it under - the terms of the Lesser GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - 0MQ is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - Lesser GNU General Public License for more details. - - You should have received a copy of the Lesser GNU General Public License - along with this program. If not, see . -*/ - -#include -#include -#ifdef _WIN32 -# include "../src/windows.hpp" -#else -# include -# include -#endif -#include "../src/stdint.hpp" - -#ifdef _WIN32 - -static uint64_t now () -{ - // Get the high resolution counter's accuracy. - LARGE_INTEGER ticksPerSecond; - QueryPerformanceFrequency (&ticksPerSecond); - - // What time is it? - LARGE_INTEGER tick; - QueryPerformanceCounter (&tick); - - // Convert the tick number into the number of seconds - // since the system was started. - double ticks_div = (double) (ticksPerSecond.QuadPart / 1000000); - return (uint64_t) (tick.QuadPart / ticks_div); -} - -void perf_sleep (int seconds_) -{ - Sleep (seconds_ * 1000); -} - -#else /* not _WIN32 */ - -static uint64_t now () -{ - struct timeval tv; - int rc; - - rc = gettimeofday (&tv, NULL); - assert (rc == 0); - return (tv.tv_sec * (uint64_t) 1000000 + tv.tv_usec); -} - -void perf_sleep (int seconds_) -{ - sleep (seconds_); -} - -#endif /* _WIN32 */ - -void *stopwatch_start () -{ - uint64_t *watch = (uint64_t*) malloc (sizeof (uint64_t)); - assert (watch); - *watch = now (); - return (void*) watch; -} - -unsigned long stopwatch_stop (void *watch_) -{ - uint64_t end = now (); - uint64_t start = *(uint64_t*) watch_; - free (watch_); - return (unsigned long) (end - start); -} diff --git a/perf/helpers.h b/perf/helpers.h deleted file mode 100644 index b790f59..0000000 --- a/perf/helpers.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - Copyright (c) 2007-2010 iMatix Corporation - - This file is part of 0MQ. - - 0MQ is free software; you can redistribute it and/or modify it under - the terms of the Lesser GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - 0MQ is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - Lesser GNU General Public License for more details. - - You should have received a copy of the Lesser GNU General Public License - along with this program. If not, see . -*/ - -#ifndef __HELPERS_H_INCLUDED__ -#define __HELPERS_H_INCLUDED__ - -/******************************************************************************/ -/* Helper functions. */ -/******************************************************************************/ - -/* Helper functions are used by perf tests so that they don't have to care */ -/* about minutiae of time-related functions on different OS platforms. */ - -/* Starts the stopwatch. Returns the handle to the watch. */ -void *stopwatch_start (); - -/* Stops the stopwatch. Returns the number of microseconds elapsed since */ -/* the stopwatch was started. */ -unsigned long stopwatch_stop (void *watch_); - -/* Sleeps for specified number of seconds. */ -void perf_sleep (int seconds_); - -#endif diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp index 0628a97..4db756d 100644 --- a/perf/local_lat.cpp +++ b/perf/local_lat.cpp @@ -18,9 +18,9 @@ */ #include "../include/zmq.h" +#include "../include/zmq_utils.h" #include #include -#include "helpers.h" int main (int argc, char *argv []) { @@ -89,7 +89,7 @@ int main (int argc, char *argv []) return -1; } - perf_sleep (1); + zmq_sleep (1); rc = zmq_close (s); if (rc != 0) { diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp index 8480ebd..54de949 100644 --- a/perf/local_thr.cpp +++ b/perf/local_thr.cpp @@ -18,9 +18,9 @@ */ #include "../include/zmq.h" +#include "../include/zmq_utils.h" #include #include -#include "helpers.h" int main (int argc, char *argv []) { @@ -88,7 +88,7 @@ int main (int argc, char *argv []) return -1; } - watch = stopwatch_start (); + watch = zmq_stopwatch_start (); for (i = 0; i != message_count - 1; i++) { rc = zmq_recv (s, &msg, 0); @@ -102,7 +102,7 @@ int main (int argc, char *argv []) } } - elapsed = stopwatch_stop (watch); + elapsed = zmq_stopwatch_stop (watch); if (elapsed == 0) elapsed = 1; diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp index cd465f7..37535e6 100644 --- a/perf/remote_lat.cpp +++ b/perf/remote_lat.cpp @@ -18,10 +18,10 @@ */ #include "../include/zmq.h" +#include "../include/zmq_utils.h" #include #include #include -#include "helpers.h" int main (int argc, char *argv []) { @@ -71,7 +71,7 @@ int main (int argc, char *argv []) } memset (zmq_msg_data (&msg), 0, message_size); - watch = stopwatch_start (); + watch = zmq_stopwatch_start (); for (i = 0; i != roundtrip_count; i++) { rc = zmq_send (s, &msg, 0); @@ -90,7 +90,7 @@ int main (int argc, char *argv []) } } - elapsed = stopwatch_stop (watch); + elapsed = zmq_stopwatch_stop (watch); rc = zmq_msg_close (&msg); if (rc != 0) { diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp index 002aaf2..c0ad9df 100644 --- a/perf/remote_thr.cpp +++ b/perf/remote_thr.cpp @@ -18,9 +18,9 @@ */ #include "../include/zmq.h" +#include "../include/zmq_utils.h" #include #include -#include "helpers.h" int main (int argc, char *argv []) { @@ -81,7 +81,7 @@ int main (int argc, char *argv []) } } - perf_sleep (10); + zmq_sleep (10); rc = zmq_close (s); if (rc != 0) { diff --git a/src/Makefile.am b/src/Makefile.am index fa97ca3..9b0ff5d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libzmq.la pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libzmq.pc -include_HEADERS = ../include/zmq.h ../include/zmq.hpp +include_HEADERS = ../include/zmq.h ../include/zmq.hpp ../include/zmq_utils.h if BUILD_PGM pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \ diff --git a/src/zmq.cpp b/src/zmq.cpp index c8f419a..73a8d65 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -661,3 +661,66 @@ int zmq_device (int device_, void *insocket_, void *outsocket_) return EINVAL; } } + +//////////////////////////////////////////////////////////////////////////////// +// 0MQ utils - to be used by perf tests +//////////////////////////////////////////////////////////////////////////////// + +#if defined ZMQ_HAVE_WINDOWS + +static uint64_t now () +{ + // Get the high resolution counter's accuracy. + LARGE_INTEGER ticksPerSecond; + QueryPerformanceFrequency (&ticksPerSecond); + + // What time is it? + LARGE_INTEGER tick; + QueryPerformanceCounter (&tick); + + // Convert the tick number into the number of seconds + // since the system was started. + double ticks_div = (double) (ticksPerSecond.QuadPart / 1000000); + return (uint64_t) (tick.QuadPart / ticks_div); +} + +void zmq_sleep (int seconds_) +{ + Sleep (seconds_ * 1000); +} + +#else + +static uint64_t now () +{ + struct timeval tv; + int rc; + + rc = gettimeofday (&tv, NULL); + assert (rc == 0); + return (tv.tv_sec * (uint64_t) 1000000 + tv.tv_usec); +} + +void zmq_sleep (int seconds_) +{ + sleep (seconds_); +} + +#endif + +void *zmq_stopwatch_start () +{ + uint64_t *watch = (uint64_t*) malloc (sizeof (uint64_t)); + assert (watch); + *watch = now (); + return (void*) watch; +} + +unsigned long zmq_stopwatch_stop (void *watch_) +{ + uint64_t end = now (); + uint64_t start = *(uint64_t*) watch_; + free (watch_); + return (unsigned long) (end - start); +} + -- cgit v1.2.3