Changeset 240

Timestamp:

10/01/13 02:26:09 (11 years ago)

Author:

atzm

Message:

• generalize ksyslog_queue_seq_ops
• add nr_queued

File:

• ksyslog/trunk/ksyslog.c (modified) (8 diffs)

ksyslog/trunk/ksyslog.c

@@ -25 +25 @@
 static struct proc_dir_entry *ksyslog_procdir = NULL;
 static struct proc_dir_entry *ksyslog_proc_queue = NULL;
+static struct proc_dir_entry *ksyslog_proc_nr_queued = NULL;
 #endif
 
@@ -372 +373 @@
 #ifdef CONFIG_PROC_FS
 static void *
-ksyslog_queue_seq_start(struct seq_file *seq, loff_t *pos)
+ksyslog_rculist_seq_start(struct seq_file *seq, loff_t *pos)
 {
         struct list_head *lh, *head = seq->private;
@@ -387 +388 @@
 
 static void *
-ksyslog_queue_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+ksyslog_rculist_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         struct list_head *lh = rcu_dereference(((struct list_head *)v)->next);
@@ -395 +396 @@
 
 static void
-ksyslog_queue_seq_stop(struct seq_file *seq, void *v)
+ksyslog_rculist_seq_stop(struct seq_file *seq, void *v)
 {
         rcu_read_unlock();
@@ -417 +418 @@
 
 static struct seq_operations ksyslog_queue_seq_ops = {
-        .start = ksyslog_queue_seq_start,
-        .next  = ksyslog_queue_seq_next,
-        .stop  = ksyslog_queue_seq_stop,
+        .start = ksyslog_rculist_seq_start,
+        .next  = ksyslog_rculist_seq_next,
+        .stop  = ksyslog_rculist_seq_stop,
         .show  = ksyslog_queue_seq_show,
 };
@@ -443 +444 @@
 
 static int
+ksyslog_nr_queued_seq_show(struct seq_file *seq, void *v)
+{
+        seq_printf(seq, "%u\n", ksyslog_queue.length);
+        return 0;
+}
+
+static int
+ksyslog_nr_queued_seq_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ksyslog_nr_queued_seq_show, PDE(inode)->data);
+}
+
+static struct file_operations ksyslog_nr_queued_fops = {
+        .owner   = THIS_MODULE,
+        .open    = ksyslog_nr_queued_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = single_release,
+};
+
+static int
 ksyslog_proc_init(void)
 {
@@ -459 +481 @@
         }
 
+        ksyslog_proc_nr_queued = proc_create("nr_queued", S_IRUGO, ksyslog_procdir,
+                                             &ksyslog_nr_queued_fops);
+        if (ksyslog_proc_nr_queued == NULL) {
+                remove_proc_entry(ksyslog_proc_queue->name, ksyslog_proc_queue->parent);
+                remove_proc_entry(ksyslog_procdir->name, ksyslog_procdir->parent);
+                pr_err("proc_create failed\n");
+                return -ENOMEM;
+        }
+
         return 0;
 }
@@ -465 +496 @@
 ksyslog_proc_destroy(void)
 {
+        if (ksyslog_proc_nr_queued)
+                remove_proc_entry(ksyslog_proc_nr_queued->name, ksyslog_proc_nr_queued->parent);
+        ksyslog_proc_nr_queued = NULL;
+
         if (ksyslog_proc_queue)
                 remove_proc_entry(ksyslog_proc_queue->name, ksyslog_proc_queue->parent);