@@ -106,14 +106,14 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \

 	$(top_srcdir)/config/depcomp

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

+	$(top_srcdir)/m4/argz.m4 \

 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \

 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

 	$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \

-	$(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \

-	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

-	$(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \

+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/m4/reorganization/version.m4 \

 	$(top_srcdir)/m4/reorganization/build_tools.m4 \

@@ -204,7 +204,9 @@ am__clamonacc_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 	./fanotif/onaccess_fan.h ./inotif/onaccess_hash.c \

 	./inotif/onaccess_hash.h ./misc/onaccess_others.c \

 	./misc/onaccess_others.h ./misc/priv_fts.h \

-	./scan/onaccess_scth.c ./scan/onaccess_scth.h ./misc/fts.c

+	./scan/onaccess_scth.c ./scan/onaccess_scth.h \

+	./scan/onaccess_scque.c ./scan/onaccess_scque.h \

+	./c-thread-pool/thpool.c ./c-thread-pool/thpool.h ./misc/fts.c

 @BUILD_CLAMD_TRUE@@SYSTEM_LFS_FTS_FALSE@am__objects_1 = clamonacc-fts.$(OBJEXT)

 @BUILD_CLAMD_TRUE@am_clamonacc_OBJECTS = clamonacc-output.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	clamonacc-optparser.$(OBJEXT) \

@@ -220,7 +222,8 @@ am__clamonacc_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 @BUILD_CLAMD_TRUE@	clamonacc-onaccess_hash.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	clamonacc-onaccess_others.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	clamonacc-onaccess_scth.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	$(am__objects_1)

+@BUILD_CLAMD_TRUE@	clamonacc-onaccess_scque.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	clamonacc-thpool.$(OBJEXT) $(am__objects_1)

 clamonacc_OBJECTS = $(am_clamonacc_OBJECTS)

 clamonacc_LDADD = $(LDADD)

 AM_V_lt = $(am__v_lt_@AM_V@)

@@ -295,6 +298,7 @@ ACLOCAL = @ACLOCAL@

 AMTAR = @AMTAR@

 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@

 AR = @AR@

+ARGZ_H = @ARGZ_H@

 AUTOCONF = @AUTOCONF@

 AUTOHEADER = @AUTOHEADER@

 AUTOMAKE = @AUTOMAKE@

@@ -417,11 +421,9 @@ LTDLINCL = @LTDLINCL@

 LTDLOPEN = @LTDLOPEN@

 LTLIBBZ2 = @LTLIBBZ2@

 LTLIBOBJS = @LTLIBOBJS@

-LT_ARGZ_H = @LT_ARGZ_H@

 LT_CONFIG_H = @LT_CONFIG_H@

 LT_DLLOADERS = @LT_DLLOADERS@

 LT_DLPREOPEN = @LT_DLPREOPEN@

-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@

 MAINT = @MAINT@

 MAKEINFO = @MAKEINFO@

 MANIFEST_TOOL = @MANIFEST_TOOL@

@@ -562,7 +564,11 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@	./misc/onaccess_others.c \

 @BUILD_CLAMD_TRUE@	./misc/onaccess_others.h ./misc/priv_fts.h \

 @BUILD_CLAMD_TRUE@	./scan/onaccess_scth.c \

-@BUILD_CLAMD_TRUE@	./scan/onaccess_scth.h $(am__append_1)

+@BUILD_CLAMD_TRUE@	./scan/onaccess_scth.h \

+@BUILD_CLAMD_TRUE@	./scan/onaccess_scque.c \

+@BUILD_CLAMD_TRUE@	./scan/onaccess_scque.h \

+@BUILD_CLAMD_TRUE@	./c-thread-pool/thpool.c \

+@BUILD_CLAMD_TRUE@	./c-thread-pool/thpool.h $(am__append_1)

 @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamd -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @CLAMONACC_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamonacc$(EXEEXT)

@@ -689,9 +695,11 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamonacc-onaccess_hash.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamonacc-onaccess_others.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamonacc-onaccess_proto.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamonacc-onaccess_scque.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamonacc-onaccess_scth.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamonacc-optparser.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamonacc-output.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamonacc-thpool.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

@@ -910,6 +918,34 @@ clamonacc-onaccess_scth.obj: ./scan/onaccess_scth.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -c -o clamonacc-onaccess_scth.obj `if test -f './scan/onaccess_scth.c'; then $(CYGPATH_W) './scan/onaccess_scth.c'; else $(CYGPATH_W) '$(srcdir)/./scan/onaccess_scth.c'; fi`

+clamonacc-onaccess_scque.o: ./scan/onaccess_scque.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -MT clamonacc-onaccess_scque.o -MD -MP -MF $(DEPDIR)/clamonacc-onaccess_scque.Tpo -c -o clamonacc-onaccess_scque.o `test -f './scan/onaccess_scque.c' || echo '$(srcdir)/'`./scan/onaccess_scque.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamonacc-onaccess_scque.Tpo $(DEPDIR)/clamonacc-onaccess_scque.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='./scan/onaccess_scque.c' object='clamonacc-onaccess_scque.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -c -o clamonacc-onaccess_scque.o `test -f './scan/onaccess_scque.c' || echo '$(srcdir)/'`./scan/onaccess_scque.c

+

+clamonacc-onaccess_scque.obj: ./scan/onaccess_scque.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -MT clamonacc-onaccess_scque.obj -MD -MP -MF $(DEPDIR)/clamonacc-onaccess_scque.Tpo -c -o clamonacc-onaccess_scque.obj `if test -f './scan/onaccess_scque.c'; then $(CYGPATH_W) './scan/onaccess_scque.c'; else $(CYGPATH_W) '$(srcdir)/./scan/onaccess_scque.c'; fi`

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamonacc-onaccess_scque.Tpo $(DEPDIR)/clamonacc-onaccess_scque.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='./scan/onaccess_scque.c' object='clamonacc-onaccess_scque.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -c -o clamonacc-onaccess_scque.obj `if test -f './scan/onaccess_scque.c'; then $(CYGPATH_W) './scan/onaccess_scque.c'; else $(CYGPATH_W) '$(srcdir)/./scan/onaccess_scque.c'; fi`

+

+clamonacc-thpool.o: ./c-thread-pool/thpool.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -MT clamonacc-thpool.o -MD -MP -MF $(DEPDIR)/clamonacc-thpool.Tpo -c -o clamonacc-thpool.o `test -f './c-thread-pool/thpool.c' || echo '$(srcdir)/'`./c-thread-pool/thpool.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamonacc-thpool.Tpo $(DEPDIR)/clamonacc-thpool.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='./c-thread-pool/thpool.c' object='clamonacc-thpool.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -c -o clamonacc-thpool.o `test -f './c-thread-pool/thpool.c' || echo '$(srcdir)/'`./c-thread-pool/thpool.c

+

+clamonacc-thpool.obj: ./c-thread-pool/thpool.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -MT clamonacc-thpool.obj -MD -MP -MF $(DEPDIR)/clamonacc-thpool.Tpo -c -o clamonacc-thpool.obj `if test -f './c-thread-pool/thpool.c'; then $(CYGPATH_W) './c-thread-pool/thpool.c'; else $(CYGPATH_W) '$(srcdir)/./c-thread-pool/thpool.c'; fi`

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamonacc-thpool.Tpo $(DEPDIR)/clamonacc-thpool.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='./c-thread-pool/thpool.c' object='clamonacc-thpool.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -c -o clamonacc-thpool.obj `if test -f './c-thread-pool/thpool.c'; then $(CYGPATH_W) './c-thread-pool/thpool.c'; else $(CYGPATH_W) '$(srcdir)/./c-thread-pool/thpool.c'; fi`

+

 clamonacc-fts.o: ./misc/fts.c

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clamonacc_CPPFLAGS) $(CPPFLAGS) $(clamonacc_CFLAGS) $(CFLAGS) -MT clamonacc-fts.o -MD -MP -MF $(DEPDIR)/clamonacc-fts.Tpo -c -o clamonacc-fts.o `test -f './misc/fts.c' || echo '$(srcdir)/'`./misc/fts.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamonacc-fts.Tpo $(DEPDIR)/clamonacc-fts.Po

@@ -51,6 +51,7 @@

 pthread_t ddd_pid = 0;

+pthread_t scque_pid = 0;

 int main(int argc, char **argv)

 {

@@ -58,6 +58,8 @@ struct onas_context {

 	int timeout;

         int64_t portnum;

+

+        int32_t maxthreads;

 } __attribute__((packed));

 #ifdef HAVE_PRAGMA_PACK

@@ -33,87 +33,76 @@

 #include <signal.h>

 #include <pthread.h>

 #include <string.h>

-#include <errno.h>

-#include <stdbool.h>

-#include <sys/fanotify.h>

-#include <sys/inotify.h>

-

-#include "../fanotif/onaccess_fan.h"

-#include "onaccess_hash.h"

-#include "onaccess_ddd.h"

-#include "../scan/onaccess_scth.h"

 #include "../misc/onaccess_others.h"

 #include "libclamav/clamav.h"

-#include "libclamav/scanners.h"

 #include "shared/optparser.h"

 #include "shared/output.h"

-#include "clamd/server.h"

-#include "clamd/others.h"

-#include "clamd/scanner.h"

-

 #include "../c-thread-pool/thpool.h"

+#include "onaccess_scth.h"

+#include "onaccess_scque.h"

+

 static void onas_scanque_exit(int sig);

-static int onas_consume_event(struct *event_data);

+static int onas_consume_event(threadpool thpool);

+static cl_error_t onas_new_event_queue_node(struct onas_event_queue_node **node);

+static void onas_destroy_event_queue_node(struct onas_event_queue_node *node);

 static pthread_mutex_t onas_queue_lock = PTHREAD_MUTEX_INITIALIZER;

+extern pthread_t scque_pid;

 static threadpool g_thpool;

 static struct onas_event_queue_node *g_onas_event_queue_head = NULL;

 static struct onas_event_queue_node *g_onas_event_queue_tail = NULL;

-static struct onas_event_queue g_onas_event_queue = {

-    head = g_onas_event_queue_head,

-    tail = g_onas_event_queue_tail,

+static struct onas_event_queue g_onas_event_queue;

-    size = 0;

-};

+static cl_error_t onas_new_event_queue_node(struct onas_event_queue_node **node) {

-static void *onas_init_event_queue() {

-    *g_onas_event_queue_head = (struct event_queue_node) {

-        .next = NULL,

-            .prev = NULL,

+	*node = malloc(sizeof(struct onas_event_queue_node));

+	if (NULL == *node) {

+		return CL_EMEM;

+	}

-            .data = NULL

-    };

-    *g_onas_event_queue_tail = &(struct event_queue_node) {

-        .next = NULL,

-            .prev = NULL,

+	**node = (struct onas_event_queue_node) {

+		.next = NULL,

+		.prev = NULL,

-            .data = NULL

-    };

+		.data = NULL

+	};

-    g_onas_event_queue_tail->prev = g_onas_event_queue_head;

-    g_onas_event_queue_head->next = g_onas_event_queue_tail;

+	return CL_SUCCESS;

 }

-extern pthread_t scque_pid;

+static void *onas_init_event_queue() {

-static cl_error_t onas_new_event_queue_node(struct event_queue_node **node) {

+	if (CL_EMEM == onas_new_event_queue_node(&g_onas_event_queue_head)) {

+		return NULL;

+	}

-	*node = malloc(sizeof(struct onas_event_queue));

-	if (NULL == *node) {

-		return CL_EMEM;

+	if (CL_EMEM == onas_new_event_queue_node(&g_onas_event_queue_tail)) {

+		return NULL;

 	}

+	g_onas_event_queue_tail->prev = g_onas_event_queue_head;

+	g_onas_event_queue_head->next = g_onas_event_queue_tail;

-	**node = (struct event_queue_node) {

-		.next = NULL,

-		.prev = NULL,

+	g_onas_event_queue = (struct onas_event_queue)  {

+		.head = g_onas_event_queue_head,

+		.tail = g_onas_event_queue_tail,

-		.data = NULL

+		.size = 0

 	};

-	return CL_SUCCESS;

+	return &g_onas_event_queue;

 }

-static void onas_destroy_event_queue_node(struct event_queue_node *node) {

+static void onas_destroy_event_queue_node(struct onas_event_queue_node *node) {

 	if (NULL == node) {

 		return;

@@ -188,12 +177,11 @@ void *onas_scanque_th(void *arg) {

 		}

 	} while(1);

-	return;

 }

 static int onas_queue_is_b_empty() {

-    if (g_onas_event_queue->head->next == g_onas_event_queue->tail) {

+    if (g_onas_event_queue.head->next == g_onas_event_queue.tail) {

         return 1;

     }

@@ -214,11 +202,11 @@ static int onas_consume_event(threadpool thpool) {

     thpool_add_work(thpool, (void *) onas_scan_worker, (void *) popped_node->data);

     g_onas_event_queue_head->next = g_onas_event_queue_head->next->next;

-    g_onas_event_queue_head->next->prev = g_onas_event_head;

+    g_onas_event_queue_head->next->prev = g_onas_event_queue_head;

     onas_destroy_event_queue_node(popped_node);

-    g_onas_event_queue->size--;

+    g_onas_event_queue.size--;

     pthread_mutex_unlock(&onas_queue_lock);

     return 0;

@@ -243,7 +231,7 @@ cl_error_t onas_queue_event(struct onas_scan_event *event_data) {

     ((struct onas_event_queue_node *) g_onas_event_queue_tail->prev)->next = node;

     g_onas_event_queue_tail->prev = node;

-    g_onas_event_queue->size++;

+    g_onas_event_queue.size++;

     pthread_mutex_unlock(&onas_queue_lock);