- added logger
authorMartin Willi <martin@strongswan.org>
Thu, 17 Nov 2005 11:20:34 +0000 (11:20 -0000)
committerMartin Willi <martin@strongswan.org>
Thu, 17 Nov 2005 11:20:34 +0000 (11:20 -0000)
Source/charon/scheduler.c
Source/charon/sender.c

index 9a32d0c..85a816e 100644 (file)
@@ -26,7 +26,9 @@
 #include "scheduler.h"
 
 #include "globals.h"
+#include "definitions.h"
 #include "utils/allocator.h"
+#include "utils/logger_manager.h"
 #include "queues/job_queue.h"
 
 /**
@@ -44,6 +46,11 @@ struct private_scheduler_s {
          * Assigned thread to the scheduler_t object
          */
         pthread_t assigned_thread;
+        
+        /** 
+         * logger for this scheduler
+         */
+        logger_t *logger;
 
 };
 
@@ -61,10 +68,12 @@ static void scheduler_thread_function(private_scheduler_t * this)
 
        for (;;)
        {
+               this->logger->log(this->logger, CONTROL, "waiting for next event...");
                /* get a job, this block until one is available */
                global_event_queue->get(global_event_queue, &current_job);
                /* queue the job in the job queue, workers will eat them */
                global_job_queue->add(global_job_queue, current_job);
+               this->logger->log(this->logger, CONTROL, "got event, added job %s to job-queue.", mapping_find(job_type_m, current_job->get_type(current_job)));
        }
 }
 
@@ -76,6 +85,8 @@ static status_t destroy(private_scheduler_t *this)
        pthread_cancel(this->assigned_thread);
 
        pthread_join(this->assigned_thread, NULL);
+       
+       global_logger_manager->destroy_logger(global_logger_manager, this->logger);
 
        allocator_free(this);
        return SUCCESS;
@@ -87,9 +98,18 @@ scheduler_t * scheduler_create()
        private_scheduler_t *this = allocator_alloc_thing(private_scheduler_t);
 
        this->public.destroy = (status_t(*)(scheduler_t*)) destroy;
+       
+       this->logger = global_logger_manager->create_logger(global_logger_manager, SCHEDULER_THREAD, NULL);
+       if (this->logger == NULL)
+       {
+               allocator_free(this);
+               return NULL;    
+       }
+       
        if (pthread_create(&(this->assigned_thread), NULL, (void*(*)(void*))scheduler_thread_function, this) != 0)
        {
                /* thread could not be created  */
+               global_logger_manager->destroy_logger(global_logger_manager, this->logger);
                allocator_free(this);
                return NULL;
        }
index 3e4ca99..b841dff 100644 (file)
@@ -30,6 +30,7 @@
 #include "globals.h"
 #include "queues/send_queue.h"
 #include "utils/allocator.h"
+#include "utils/logger_manager.h"
 
 /**
  * Private data of a sender object
@@ -46,6 +47,11 @@ struct private_sender_s {
          * Assigned thread to the sender_t object
          */
         pthread_t assigned_thread;
+        
+        /**
+         * logger for this sender
+         */
+        logger_t *logger;
 
 };
 
@@ -57,31 +63,26 @@ struct private_sender_s {
  */
 static void sender_thread_function(private_sender_t * this)
 {
+       packet_t * current_packet;
+       status_t status;
+       
        /* cancellation disabled by default */
        pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-       packet_t * current_packet;
 
        while (1)
        {
                while (global_send_queue->get(global_send_queue,&current_packet) == SUCCESS)
                {
-                       if (    global_socket->send(global_socket,current_packet) == SUCCESS)
+                       this->logger->log(this->logger, CONTROL, "got a packet, sending it");
+                       status = global_socket->send(global_socket,current_packet);
+                       if (status != SUCCESS)
                        {
-                               current_packet->destroy(current_packet);
+                               this->logger->log(this->logger, ERROR, "sending failed, socket returned %s", 
+                                                                       mapping_find(status_m, status));
                        }
-                       else
-                       {
-                               /* Packet could not be sent */
-                               /* TODO LOG it */
-                       }
-
+                       current_packet->destroy(current_packet);
                }
-
-               /* NOT GOOD !!!!!! */
-               /* TODO LOG it */
        }
-
-
 }
 
 /**
@@ -103,6 +104,14 @@ sender_t * sender_create()
        private_sender_t *this = allocator_alloc_thing(private_sender_t);
 
        this->public.destroy = (status_t(*)(sender_t*)) destroy;
+       
+       this->logger = global_logger_manager->create_logger(global_logger_manager, SENDER_THREAD, NULL);
+       if (this->logger == NULL)
+       {
+               allocator_free(this);
+               return NULL;    
+       }
+       
        if (pthread_create(&(this->assigned_thread), NULL, (void*(*)(void*))sender_thread_function, this) != 0)
        {
                /* thread could not be created  */