Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324481
b: refs/heads/master
c: 0edc6c6
h: refs/heads/master
i:
  324479: ea7ca3e
v: v3
  • Loading branch information
Cruz Julian Bishop authored and Greg Kroah-Hartman committed Aug 14, 2012
1 parent 5531d51 commit e402612
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: adb913658f5cecc02dd8f36aa9edecb3e9fd3399
refs/heads/master: 0edc6c6d545f2615d9239d5ea350d7ed833ee539
40 changes: 26 additions & 14 deletions trunk/drivers/staging/android/logger.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,38 +32,50 @@

#include <asm/ioctls.h>

/*
/**
* struct logger_log - represents a specific log, such as 'main' or 'radio'
* @buffer: The actual ring buffer
* @misc: The "misc" device representing the log
* @wq: The wait queue for @readers
* @readers: This log's readers
* @mutex: The mutex that protects the @buffer
* @w_off: The current write head offset
* @head: The head, or location that readers start reading at.
* @size: The size of the log
* @logs: The list of log channels
*
* This structure lives from module insertion until module removal, so it does
* not need additional reference counting. The structure is protected by the
* mutex 'mutex'.
*/
struct logger_log {
unsigned char *buffer;/* the ring buffer itself */
struct miscdevice misc; /* misc device representing the log */
wait_queue_head_t wq; /* wait queue for readers */
struct list_head readers; /* this log's readers */
struct mutex mutex; /* mutex protecting buffer */
size_t w_off; /* current write head offset */
size_t head; /* new readers start here */
size_t size; /* size of the log */
struct list_head logs; /* list of log channels (myself)*/
unsigned char *buffer;
struct miscdevice misc;
wait_queue_head_t wq;
struct list_head readers;
struct mutex mutex;
size_t w_off;
size_t head;
size_t size;
struct list_head logs;
};

static LIST_HEAD(log_list);


/*
/**
* struct logger_reader - a logging device open for reading
* @log: The associated log
* @list: The associated entry in @logger_log's list
* @r_off: The current read head offset.
*
* This object lives from open to release, so we don't need additional
* reference counting. The structure is protected by log->mutex.
*/
struct logger_reader {
struct logger_log *log; /* associated log */
struct list_head list; /* entry in logger_log's list */
size_t r_off; /* current read head offset */
struct logger_log *log;
struct list_head list;
size_t r_off;
};

/* logger_offset - returns index 'n' into the log via (optimized) modulus */
Expand Down

0 comments on commit e402612

Please sign in to comment.