diff options
| -rw-r--r-- | include/xs.h | 14 | ||||
| -rw-r--r-- | include/xs_utils.h | 70 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/xs.cpp | 21 | ||||
| -rw-r--r-- | src/xs_utils.cpp | 47 |
5 files changed, 38 insertions, 121 deletions
diff --git a/include/xs.h b/include/xs.h index a339bb9..f61a41a 100644 --- a/include/xs.h +++ b/include/xs.h @@ -241,6 +241,20 @@ typedef struct XS_EXPORT int xs_poll (xs_pollitem_t *items, int nitems, long timeout); +/******************************************************************************/ +/* The following utility functions are exported for use from language */ +/* bindings in performance tests, for the purpose of consistent results in */ +/* such tests. They are not considered part of the core XS API per se, */ +/* use at your own risk! */ +/******************************************************************************/ + +/* Starts the stopwatch. Returns the handle to the watch. */ +XS_EXPORT void *xs_stopwatch_start (void); + +/* Stops the stopwatch. Returns the number of microseconds elapsed since */ +/* the stopwatch was started. */ +XS_EXPORT unsigned long xs_stopwatch_stop (void *watch); + #undef XS_EXPORT #ifdef __cplusplus diff --git a/include/xs_utils.h b/include/xs_utils.h deleted file mode 100644 index c308d05..0000000 --- a/include/xs_utils.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - Copyright (c) 2009-2012 250bpm s.r.o. - Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file - - This file is part of Crossroads I/O project. - - Crossroads I/O 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. - - Crossroads 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/>. -*/ - -#ifndef __XS_UTILS_H_INCLUDED__ -#define __XS_UTILS_H_INCLUDED__ - -#ifdef __cplusplus -extern "C" { -#endif - -/* Handle DSO symbol visibility */ -#if defined _WIN32 -# if defined DLL_EXPORT -# define XS_EXPORT __declspec(dllexport) -# else -# define XS_EXPORT __declspec(dllimport) -# endif -#else -# if defined __SUNPRO_C || defined __SUNPRO_CC -# define XS_EXPORT __global -# elif (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER -# define XS_EXPORT __attribute__ ((visibility("default"))) -# else -# define XS_EXPORT -# endif -#endif - -/* Helper functions are used by perf tests so that they don't have to care */ -/* about minutiae of different OS platforms. */ - -/* Starts the stopwatch. Returns the handle to the watch. */ -XS_EXPORT void *xs_stopwatch_start (void); - -/* Stops the stopwatch. Returns the number of microseconds elapsed since */ -/* the stopwatch was started. */ -XS_EXPORT unsigned long xs_stopwatch_stop (void *watch); - -/* Sleeps for specified number of seconds. */ -XS_EXPORT void xs_sleep (int seconds); - -/* Creates a new thread. */ -XS_EXPORT void *xs_thread_create (void (*fn) (void *arg), void* arg); - -/* Wait for thread to finish. */ -XS_EXPORT void xs_thread_join (void *thread); - -#undef XS_EXPORT - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/Makefile.am b/src/Makefile.am index 0b226a1..c30c6cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,14 +5,14 @@ lib_LTLIBRARIES = libxs.la libzmq.la pkgconfig_DATA = libxs.pc libzmq.pc -include_HEADERS = ../include/xs.h ../include/xs_utils.h \ +include_HEADERS = ../include/xs.h \ ../include/zmq.h ../include/zmq_utils.h else lib_LTLIBRARIES = libxs.la pkgconfig_DATA = libxs.pc -include_HEADERS = ../include/xs.h ../include/xs_utils.h +include_HEADERS = ../include/xs.h endif libxs_la_SOURCES = \ @@ -138,8 +138,7 @@ libxs_la_SOURCES = \ xrep.cpp \ xreq.cpp \ xsub.cpp \ - xs.cpp \ - xs_utils.cpp + xs.cpp if ON_MINGW libxs_la_LDFLAGS = -no-undefined -avoid-version -version-info @LIBXS_ABI_VERSION@ @LIBXS_EXTRA_LDFLAGS@ @@ -37,6 +37,7 @@ #include "config.hpp" #include "likely.hpp" #include "upoll.hpp" +#include "clock.hpp" #include "ctx.hpp" #include "err.hpp" #include "msg.hpp" @@ -356,4 +357,24 @@ int xs_errno () return errno; } +// The following utility functions are exported for use from language bindings +// in performance tests, for the purpose of consistent results in such tests. +// They are not considered part of the core XS API per se, use at your own +// risk! + +void *xs_stopwatch_start () +{ + uint64_t *watch = (uint64_t*) malloc (sizeof (uint64_t)); + alloc_assert (watch); + *watch = xs::clock_t::now_us (); + return (void*) watch; +} + +unsigned long xs_stopwatch_stop (void *watch_) +{ + uint64_t end = xs::clock_t::now_us (); + uint64_t start = *(uint64_t*) watch_; + free (watch_); + return (unsigned long) (end - start); +} diff --git a/src/xs_utils.cpp b/src/xs_utils.cpp deleted file mode 100644 index d2fe755..0000000 --- a/src/xs_utils.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - Copyright (c) 2009-2012 250bpm s.r.o. - Copyright (c) 2007-2009 iMatix Corporation - Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file - - This file is part of Crossroads I/O project. - - Crossroads I/O 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. - - Crossroads 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/xs_utils.h" - -#include <stdlib.h> - -#include "stdint.hpp" -#include "clock.hpp" -#include "err.hpp" - -void *xs_stopwatch_start () -{ - uint64_t *watch = (uint64_t*) malloc (sizeof (uint64_t)); - alloc_assert (watch); - *watch = xs::clock_t::now_us (); - return (void*) watch; -} - -unsigned long xs_stopwatch_stop (void *watch_) -{ - uint64_t end = xs::clock_t::now_us (); - uint64_t start = *(uint64_t*) watch_; - free (watch_); - return (unsigned long) (end - start); -} - |