diff options
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/zmq.cpp | 30 | ||||
| -rw-r--r-- | src/zmq_utils.cpp | 60 |
3 files changed, 62 insertions, 31 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3538327..32b144e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -132,7 +132,8 @@ libzmq_la_SOURCES = \ zmq_connecter.cpp \ zmq_engine.cpp \ zmq_init.cpp \ - zmq_listener.cpp + zmq_listener.cpp \ + zmq_utils.cpp if ON_MINGW libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ diff --git a/src/zmq.cpp b/src/zmq.cpp index 525e604..9ea106d 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -33,7 +33,6 @@ #endif #include "../include/zmq.h" -#include "../include/zmq_utils.h" #include <string.h> #include <errno.h> @@ -57,7 +56,6 @@ #if defined ZMQ_HAVE_OPENPGM #define __PGM_WININT_H__ #include <pgm/pgm.h> - #endif void zmq_version (int *major_, int *minor_, int *patch_) @@ -778,31 +776,3 @@ int zmq_errno () return errno; } -//////////////////////////////////////////////////////////////////////////////// -// 0MQ utils - to be used by perf tests -//////////////////////////////////////////////////////////////////////////////// - -void zmq_sleep (int seconds_) -{ -#if defined ZMQ_HAVE_WINDOWS - Sleep (seconds_ * 1000); -#else - sleep (seconds_); -#endif -} - -void *zmq_stopwatch_start () -{ - uint64_t *watch = (uint64_t*) malloc (sizeof (uint64_t)); - alloc_assert (watch); - *watch = zmq::clock_t::now_us (); - return (void*) watch; -} - -unsigned long zmq_stopwatch_stop (void *watch_) -{ - uint64_t end = zmq::clock_t::now_us (); - uint64_t start = *(uint64_t*) watch_; - free (watch_); - return (unsigned long) (end - start); -} diff --git a/src/zmq_utils.cpp b/src/zmq_utils.cpp new file mode 100644 index 0000000..c7eb60f --- /dev/null +++ b/src/zmq_utils.cpp @@ -0,0 +1,60 @@ +/* + Copyright (c) 2007-2011 iMatix Corporation + Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file + + This file is part of 0MQ. + + 0MQ is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser 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 + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "platform.hpp" + +#include "../include/zmq_utils.h" + +#include <stdlib.h> + +#include "stdint.hpp" +#include "clock.hpp" +#include "err.hpp" + +#if !defined ZMQ_HAVE_WINDOWS +#include <unistd.h> +#else +#include "windows.hpp" +#endif + +void zmq_sleep (int seconds_) +{ +#if defined ZMQ_HAVE_WINDOWS + Sleep (seconds_ * 1000); +#else + sleep (seconds_); +#endif +} + +void *zmq_stopwatch_start () +{ + uint64_t *watch = (uint64_t*) malloc (sizeof (uint64_t)); + alloc_assert (watch); + *watch = zmq::clock_t::now_us (); + return (void*) watch; +} + +unsigned long zmq_stopwatch_stop (void *watch_) +{ + uint64_t end = zmq::clock_t::now_us (); + uint64_t start = *(uint64_t*) watch_; + free (watch_); + return (unsigned long) (end - start); +} |