Changeset 242 for ksyslog/trunk

Timestamp:

10/01/13 20:59:01 (11 years ago)

Author:

atzm

Message:

move ksyslog_queue_lock into struct ksyslog_queue

Location:

ksyslog/trunk

Files:

• ksyslog.c (modified) (8 diffs)
• ksyslog.h (modified) (1 diff)

ksyslog/trunk/ksyslog.c

@@ -12 +12 @@
 #include "ksyslog.h"
 
-static DEFINE_SPINLOCK(ksyslog_queue_lock);
 static DEFINE_SPINLOCK(ksyslog_vfs_lock);
 
+static struct ksyslog_queue ksyslog_queue;
 static struct socket *ksyslog_rcv_sk = NULL;
 
 static struct delayed_work ksyslog_work;
 static struct workqueue_struct *ksyslog_wq = NULL;
-
-static struct ksyslog_queue ksyslog_queue;
 
 #ifdef CONFIG_PROC_FS
@@ -33 +31 @@
 static ushort ksyslog_port = 514;
 static char *ksyslog_path = "/var/log/ksyslog.log";
-static ulong ksyslog_queue_length = 2048;
+static ulong ksyslog_queue_length = 4096;
 static ulong ksyslog_flush_interval = 45;  /* milliseconds */
 
@@ -47 +45 @@
         memset(queue, 0, sizeof(*queue));
         INIT_LIST_HEAD(&queue->head);
+        spin_lock_init(&queue->lock);
         atomic64_set(&queue->nr_queued, 0);
         atomic64_set(&queue->nr_written, 0);
@@ -288 +287 @@
         ksyslog_queue_init(&write_queue);
 
-        spin_lock_bh(&ksyslog_queue_lock);
+        spin_lock_bh(&ksyslog_queue.lock);
         ksyslog_entry_migrate(&ksyslog_queue, &write_queue);
-        spin_unlock_bh(&ksyslog_queue_lock);
+        spin_unlock_bh(&ksyslog_queue.lock);
 
         if (atomic64_read(&write_queue.nr_queued) <= 0)
@@ -301 +300 @@
                 spin_unlock(&ksyslog_vfs_lock);
 
-                spin_lock_bh(&ksyslog_queue_lock);
+                spin_lock_bh(&ksyslog_queue.lock);
                 ksyslog_entry_migrate(&write_queue, &ksyslog_queue);
-                spin_unlock_bh(&ksyslog_queue_lock);
+                spin_unlock_bh(&ksyslog_queue.lock);
 
                 goto out;
@@ -329 +328 @@
 
 restore:
-                spin_lock_bh(&ksyslog_queue_lock);
+                spin_lock_bh(&ksyslog_queue.lock);
                 if (unlikely(ksyslog_entry_add(&ksyslog_queue, entry))) {
                         atomic64_inc(&ksyslog_queue.nr_dropped);
@@ -335 +334 @@
                         call_rcu(&entry->rcu, ksyslog_entry_free);
                 }
-                spin_unlock_bh(&ksyslog_queue_lock);
+                spin_unlock_bh(&ksyslog_queue.lock);
         }
 
@@ -366 +365 @@
                 goto err;
 
-        spin_lock_bh(&ksyslog_queue_lock);
+        spin_lock_bh(&ksyslog_queue.lock);
         err = ksyslog_entry_add(&ksyslog_queue, entry);
-        spin_unlock_bh(&ksyslog_queue_lock);
+        spin_unlock_bh(&ksyslog_queue.lock);
 
         if (unlikely(err)) {

ksyslog/trunk/ksyslog.h

@@ -74 +74 @@
 struct ksyslog_queue {
         struct list_head head;
+        spinlock_t lock;
         atomic64_t nr_queued;
         atomic64_t nr_written;