Merge pull request #11 from pr0gg3d/dev

Add check for pthread_setaffinity_np
This commit is contained in:
Luca Deri
2015-05-25 09:53:15 +02:00
2 changed files with 4 additions and 1 deletions
+3
View File
@@ -79,6 +79,8 @@ LIBS=$OLD_LIBS
AC_CHECK_LIB(json-c, json_object_new_object, AC_DEFINE_UNQUOTED(HAVE_JSON_C, 1, [The JSON-C library is present]))
AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np]))
AC_CONFIG_FILES([Makefile src/lib/Makefile example/Makefile libndpi.pc])
AC_CONFIG_HEADERS(config.h)
AC_SUBST(GIT_RELEASE)
@@ -86,5 +88,6 @@ AC_SUBST(SVN_DATE)
AC_SUBST(JSON_C_LIB)
AC_SUBST(PCAP_INC)
AC_SUBST(PCAP_LIB)
AC_SUBST(HAVE_PTHREAD_SETAFFINITY_NP)
AC_OUTPUT
+1 -1
View File
@@ -1662,7 +1662,7 @@ static void runPcapLoop(u_int16_t thread_id) {
void *processing_thread(void *_thread_id) {
long thread_id = (long) _thread_id;
#ifdef linux
#if defined(linux) && defined(HAVE_PTHREAD_SETAFFINITY_NP)
if(core_affinity[thread_id] >= 0) {
cpu_set_t cpuset;
CPU_ZERO(&cpuset);