- threads are new identified by pid
authorMartin Willi <martin@strongswan.org>
Sat, 26 Nov 2005 15:44:40 +0000 (15:44 -0000)
committerMartin Willi <martin@strongswan.org>
Sat, 26 Nov 2005 15:44:40 +0000 (15:44 -0000)
Source/charon/threads/receiver.c
Source/charon/threads/scheduler.c
Source/charon/threads/sender.c
Source/charon/threads/thread_pool.c
Source/charon/threads/thread_pool.h

index b46949b..b78ebcf 100644 (file)
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <pthread.h>
+#include <unistd.h>
 
 #include "receiver.h"
 
@@ -71,8 +72,12 @@ static void receive_packets(private_receiver_t * this)
 {
        packet_t * current_packet;
        job_t *current_job;
+       
        /* cancellation disabled by default */
        pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
+       
+       this->logger->log(this->logger, CONTROL, "receiver thread running, pid %d", getpid());
+       
        while (1)
        {
                while (global_socket->receive(global_socket,&current_packet) == SUCCESS)
index 8349d36..774bd3a 100644 (file)
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <pthread.h>
+#include <unistd.h>
 
 #include "scheduler.h"
 
@@ -69,9 +70,12 @@ struct private_scheduler_t {
  */
 static void get_events(private_scheduler_t * this)
 {
+       job_t *current_job;
+       
        /* cancellation disabled by default */
        pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-       job_t *current_job;
+       
+       this->logger->log(this->logger, CONTROL, "scheduler thread running, pid %d", getpid());
 
        for (;;)
        {
index 5ad00e0..2b33c0d 100644 (file)
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <pthread.h>
+#include <unistd.h>
 
 #include "sender.h"
 
@@ -73,6 +74,8 @@ static void send_packets(private_sender_t * this)
        /* cancellation disabled by default */
        pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
 
+       this->logger->log(this->logger, CONTROL, "sender thread running, pid %d", getpid());
+
        while (1)
        {
                while (global_send_queue->get(global_send_queue,&current_packet) == SUCCESS)
index ee8d50b..c22f5fe 100644 (file)
@@ -24,6 +24,7 @@
 #include <pthread.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include "thread_pool.h"
  
@@ -104,7 +105,8 @@ static void process_jobs(private_thread_pool_t *this)
 {
        /* cancellation disabled by default */
        pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-       this->worker_logger->log(this->worker_logger, CONTROL, "started working");
+       
+       this->worker_logger->log(this->worker_logger, CONTROL, "worker thread running, pid: %d", getpid());
 
        for (;;) {
                job_t *job;
@@ -318,14 +320,14 @@ static status_t destroy(private_thread_pool_t *this)
        int current;
        /* flag thread for termination */
        for (current = 0; current < this->pool_size; current++) {
-               this->pool_logger->log(this->pool_logger, CONTROL, "cancelling thread %u", this->threads[current]);
+               this->pool_logger->log(this->pool_logger, CONTROL, "cancelling worker a thread #%d", current+1);
                pthread_cancel(this->threads[current]);
        }
        
        /* wait for all threads */
        for (current = 0; current < this->pool_size; current++) {
                pthread_join(this->threads[current], NULL);
-               this->pool_logger->log(this->pool_logger, CONTROL, "thread %u terminated", this->threads[current]);
+               this->pool_logger->log(this->pool_logger, CONTROL, "worker thread #%d terminated", current+1);
        }       
 
        /* free mem */
@@ -384,14 +386,14 @@ thread_pool_t *thread_pool_create(size_t pool_size)
        {
                if (pthread_create(&(this->threads[current]), NULL, (void*(*)(void*))this->process_jobs, this) == 0) 
                {
-                       this->pool_logger->log(this->pool_logger, CONTROL, "thread %u created", this->threads[current]);
+                       this->pool_logger->log(this->pool_logger, CONTROL, "created worker thread #%d", current+1);
                }
-               else 
+               else
                {
                        /* creation failed, is it the first one? */     
                        if (current == 0) 
                        {
-                               this->pool_logger->log(this->pool_logger, ERROR, "could not create any thread: %s\n", strerror(errno));
+                               this->pool_logger->log(this->pool_logger, ERROR, "could not create any thread");
                                global_logger_manager->destroy_logger(global_logger_manager, this->pool_logger);
                                global_logger_manager->destroy_logger(global_logger_manager, this->worker_logger);
                                allocator_free(this->threads);
@@ -399,7 +401,7 @@ thread_pool_t *thread_pool_create(size_t pool_size)
                                return NULL;
                        }
                        /* not all threads could be created, but at least one :-/ */
-                       this->pool_logger->log(this->pool_logger, CONTROL, "could only create %d from requested %d threads: %s\n", current, pool_size, strerror(errno));
+                       this->pool_logger->log(this->pool_logger, ERROR, "could only create %d from requested %d threads!", current, pool_size);
                                
                        this->pool_size = current;
                        return (thread_pool_t*)this;
index aac803a..46166bf 100644 (file)
@@ -1,7 +1,7 @@
 /**
  * @file thread_pool.h
  * 
- * @brief Interface for thread_pool_t.
+ * @brief Interface of thread_pool_t.
  * 
  */