Current code works as shown below; this makes more readable messages to
vanish
|------- pull_len = len ----------|
|----------< len >-----------------| ^ new r_off
^old w_off ^r_off ^new w_off
where len = length of the new message to be written
New version works as shown below; It reduces the total skipped readable
messages
|- pull_len = (len - (r_off - old_w_off)) + 1 --|
|----------< len >-----------------| ^ new
r_off
^old w_off ^r_off ^new w_off
---
drivers/staging/android/logger.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/android/logger.c
b/drivers/staging/android/logger.c
index eb3d4ca..9e3b187 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -377,14 +377,29 @@ static void fix_up_readers(struct logger_log *log,
size_t len)
{
size_t old = log->w_off;
size_t new = logger_offset(log, old + len);
+ size_t pull, skip;
struct logger_reader *reader;
- if (is_between(old, new, log->head))
- log->head = get_next_entry(log, log->head, len);
+ if (is_between(old, new, log->head)) {
+ if (log->head > old)
+ skip = log->head - old;
+ else
+ skip = log->size - (old - log->head);
+
+ pull = (len - skip) + 1;
+ log->head = get_next_entry(log, log->head, pull);
+ }
list_for_each_entry(reader, &log->readers, list)
- if (is_between(old, new, reader->r_off))
- reader->r_off = get_next_entry(log, reader->r_off, len);
+ if (is_between(old, new, reader->r_off)) {
+ if (reader->r_off > old)
+ skip = reader->r_off - old;
+ else
+ skip = log->size - (old - reader->r_off);
+
+ pull = (len - skip) + 1;
+ reader->r_off = get_next_entry(log, reader->r_off, pull);
+ }
}
/*
--
1.7.9.5
--
--
unsubscribe: [email protected]
website: http://groups.google.com/group/android-kernel
---
You received this message because you are subscribed to the Google Groups
"Android Linux Kernel Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
>From 37cc4e557b1d5b80f493e4564af743aeb1165cb0 Mon Sep 17 00:00:00 2001
From: Arun chandran <[email protected]>
Date: Sun, 7 Apr 2013 15:08:00 +0530
Subject: [PATCH] Android logger:correct the pull length in fix_up_readers()
Current code works as shown below; this makes more readable messages to
vanish
|------- pull_len = len ----------|
|----------< len >-----------------| ^ new r_off
^old w_off ^r_off ^new w_off
where len = length of the new message to be written
New version works as shown below; It reduces the total skipped readable
messages
|- pull_len = (len - (r_off - old_w_off)) + 1 --|
|----------< len >-----------------| ^ new r_off
^old w_off ^r_off ^new w_off
---
drivers/staging/android/logger.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index eb3d4ca..9e3b187 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -377,14 +377,29 @@ static void fix_up_readers(struct logger_log *log, size_t len)
{
size_t old = log->w_off;
size_t new = logger_offset(log, old + len);
+ size_t pull, skip;
struct logger_reader *reader;
- if (is_between(old, new, log->head))
- log->head = get_next_entry(log, log->head, len);
+ if (is_between(old, new, log->head)) {
+ if (log->head > old)
+ skip = log->head - old;
+ else
+ skip = log->size - (old - log->head);
+
+ pull = (len - skip) + 1;
+ log->head = get_next_entry(log, log->head, pull);
+ }
list_for_each_entry(reader, &log->readers, list)
- if (is_between(old, new, reader->r_off))
- reader->r_off = get_next_entry(log, reader->r_off, len);
+ if (is_between(old, new, reader->r_off)) {
+ if (reader->r_off > old)
+ skip = reader->r_off - old;
+ else
+ skip = log->size - (old - reader->r_off);
+
+ pull = (len - skip) + 1;
+ reader->r_off = get_next_entry(log, reader->r_off, pull);
+ }
}
/*
--
1.7.9.5
