Module: xenomai-jki
Branch: queues/proc
Commit: 77208e482fb060cdcf1841e6ca7bab93807d0de6
URL:
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=77208e482fb060cdcf1841e6ca7bab93807d0de6
Author: Wolfgang Mauerer <wolfgang.maue...@siemens.com>
Date: Fri Apr 16 18:07:34 2010 +0200
native: Convert mutex registry proc entry to seq_file
Signed-off-by: Wolfgang Mauerer <wolfgang.maue...@siemens.com>
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
ksrc/skins/native/mutex.c | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/ksrc/skins/native/mutex.c b/ksrc/skins/native/mutex.c
index 6cf7eb1..4f3e9dc 100644
--- a/ksrc/skins/native/mutex.c
+++ b/ksrc/skins/native/mutex.c
@@ -53,17 +53,15 @@
#ifdef CONFIG_PROC_FS
-static int __mutex_read_proc(char *page,
- char **start,
- off_t off, int count, int *eof, void *data)
+#include <linux/seq_file.h>
+
+static int mutex_seq_show(struct seq_file *f, void *v)
{
- RT_MUTEX *mutex = (RT_MUTEX *)data;
+ RT_MUTEX *mutex = (RT_MUTEX *)f->private;
#ifdef CONFIG_XENO_FASTSYNCH
xnhandle_t lock_state;
#endif /* CONFIG_XENO_FASTSYNCH */
xnthread_t *owner;
- char *p = page;
- int len;
spl_t s;
xnlock_get_irqsave(&nklock, s);
@@ -77,42 +75,45 @@ static int __mutex_read_proc(char *page,
xnthread_lookup(xnsynch_fast_mask_claimed(lock_state));
if (!owner && lock_state != XN_NO_HANDLE)
- p += sprintf(p, "=<DAMAGED HANDLE!>");
+ seq_printf(f, "=<DAMAGED HANDLE!>");
else
#endif /* CONFIG_XENO_FASTSYNCH */
if (owner) {
/* Locked mutex -- dump owner and waiters, if any. */
xnpholder_t *holder;
- p += sprintf(p, "=locked by %s\n", xnthread_name(owner));
+ seq_printf(f, "=locked by %s\n", xnthread_name(owner));
holder = getheadpq(xnsynch_wait_queue(&mutex->synch_base));
while (holder) {
xnthread_t *sleeper = link2thread(holder, plink);
- p += sprintf(p, "+%s\n", xnthread_name(sleeper));
+ seq_printf(f, "+%s\n", xnthread_name(sleeper));
holder = nextpq(xnsynch_wait_queue(&mutex->synch_base),
holder);
}
} else
/* Mutex unlocked. */
- p += sprintf(p, "=unlocked\n");
+ seq_printf(f, "=unlocked\n");
xnlock_put_irqrestore(&nklock, s);
- len = (p - page) - off;
- if (len <= off + count)
- *eof = 1;
- *start = page + off;
- if (len > count)
- len = count;
- if (len < 0)
- len = 0;
+ return 0;
+}
- return len;
+static int mutex_seq_open(struct inode *inode, struct file *file)
+{
+ return single_open(file, mutex_seq_show, PDE(inode)->data);
}
+static struct file_operations mutex_proc_fops = {
+ .owner = THIS_MODULE,
+ .open = mutex_seq_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+};
+
extern xnptree_t __native_ptree;
static xnpnode_t __mutex_pnode = {
@@ -120,8 +121,9 @@ static xnpnode_t __mutex_pnode = {
.dir = NULL,
.type = "mutexes",
.entries = 0,
- .read_proc = &__mutex_read_proc,
+ .read_proc = NULL,
.write_proc = NULL,
+ .fops = &mutex_proc_fops,
.root = &__native_ptree,
};
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
