@@ -82,6 +82,8 @@ int main(int argc, char **argv)

 	}

 	ctx->clamdopts = clamdopts;

+        ctx->maxthreads = optget(ctx->clamdopts, "OnAccessMaxThreads")->numarg;

+

         /* Setup our event queue */

         switch(onas_scanque_start(&ctx)) {

             case CL_SUCCESS:

@@ -230,7 +230,10 @@ int onas_fan_eloop(struct onas_context **ctx) {

                                         /* fanotify specific stuffs */

 					event_data->bool_opts |= ONAS_SCTH_B_FANOTIFY;

 					event_data->fmd = fmd;

+                                        event_data->pathname = cli_strdup(fname);

+

+					logg("ClamFanotif: attempting to feed consumer queue\n");

 					/* feed consumer queue */

 					if (CL_SUCCESS != onas_queue_event(event_data)) {

                 close(fmd->fd);

@@ -345,7 +345,7 @@ void *onas_ddd_th(void *arg) {

 	 * SIGFPE, SIGILL, SIGSEGV, or SIGBUS signal */

     sigdelset(&sigset, SIGFPE);

     sigdelset(&sigset, SIGILL);

-    sigdelset(&sigset, SIGSEGV);

+	//sigdelset(&sigset, SIGSEGV);

 #ifdef SIGBUS

     sigdelset(&sigset, SIGBUS);

 #endif

@@ -153,7 +153,7 @@ void *onas_scanque_th(void *arg) {

 	 * SIGFPE, SIGILL, SIGSEGV, or SIGBUS signal */

 	sigdelset(&sigset, SIGFPE);

 	sigdelset(&sigset, SIGILL);

-	sigdelset(&sigset, SIGSEGV);

+	//sigdelset(&sigset, SIGSEGV);

 #ifdef SIGBUS

 	sigdelset(&sigset, SIGBUS);

 #endif

@@ -164,11 +164,13 @@ void *onas_scanque_th(void *arg) {

 	sigaction(SIGUSR1, &act, NULL);

 	sigaction(SIGSEGV, &act, NULL);

+	logg("*ClamQueue: initializing event queue consumer w/ (%d) threads in thread pool\n", ctx->maxthreads);

         onas_init_event_queue();

         threadpool thpool = thpool_init(ctx->maxthreads);

 	g_thpool = thpool;

         /* loop w/ onas_consume_event until we die */

+	logg("*ClamQueue: waiting to cosume events ...\n");

 	do {

 		/* if there's no event to consume ... */

 		if (!onas_consume_event(thpool)) {

@@ -196,6 +198,7 @@ static int onas_consume_event(threadpool thpool) {

     /* TODO: create scth arg using head event data, use get queue head here before lock*/

     if (onas_queue_is_b_empty()) {

+        pthread_mutex_unlock(&onas_queue_lock);

         return 1;

     }

@@ -214,10 +217,13 @@ static int onas_consume_event(threadpool thpool) {

 cl_error_t onas_queue_event(struct onas_scan_event *event_data) {

+

+    logg("*ClamonQueue: queueing event!\n");

     pthread_mutex_lock(&onas_queue_lock);

     struct onas_event_queue_node *node = NULL;

+    logg("*ClamonQueue: queueing event!\n");

     if (CL_EMEM == onas_new_event_queue_node(&node)) {

 	    return CL_EMEM;

     }

@@ -262,6 +262,9 @@ void *onas_scan_worker(void *arg) {

 	if (NULL == event_data || NULL == event_data->pathname) {

 		logg("ClamWorker: invalid worker arguments for scanning thread\n");

+                if (event_data) {

+                    logg("ClamWorker: pathname is null\n");

+                }

         goto done;

     }

@@ -423,6 +423,9 @@ const struct clam_option __clam_options[] = {

     { "OnAccessCurlTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 5000l, NULL, 0, OPT_CLAMD, "Max amount of time (in milliseconds) that the OnAccess client should spend for every connect, send, and recieve attempt when communicating with clamd via curl (5s default)", "10000L" },

+    { "OnAccessMaxThreads", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 5, NULL, 0, OPT_CLAMD, "Max number of scanning threads to allocate to the OnAccess thread pool at startup--these threads are the ones responsible for creating a connection with the daemon and kicking off scanning after an event has been processed. To prevent clamonacc from consuming all clamd's resources keep this lower than clamd's max threads. Default is 5", "10" },

+

+

     /* clamonacc cmdline options */

     { NULL, "watch-list", 'w', CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_CLAMONACC, "", ""},