From b33e336cbd75a8f7810b14650e9ccf439dd4cebb Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 25 Oct 2019 01:42:10 -0400 Subject: Implement ringDiff and ringRead --- ring.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'ring.c') diff --git a/ring.c b/ring.c index ff83cea..d3b04f6 100644 --- a/ring.c +++ b/ring.c @@ -41,25 +41,41 @@ void ringWrite(const char *line) { static struct { char **names; - size_t *reads; + size_t *ptrs; size_t cap, len; -} reader; +} read; size_t ringReader(const char *name) { - for (size_t i = 0; i < reader.len; ++i) { - if (!strcmp(reader.names[i], name)) return i; + for (size_t i = 0; i < read.len; ++i) { + if (!strcmp(read.names[i], name)) return i; } - if (reader.len == reader.cap) { - reader.cap = (reader.cap ? reader.cap * 2 : 8); - reader.names = realloc(reader.names, sizeof(*reader.names) * reader.cap); - if (!reader.names) err(EX_OSERR, "realloc"); - reader.reads = realloc(reader.reads, sizeof(*reader.reads) * reader.cap); - if (!reader.reads) err(EX_OSERR, "realloc"); + if (read.len == read.cap) { + read.cap = (read.cap ? read.cap * 2 : 8); + read.names = realloc(read.names, sizeof(*read.names) * read.cap); + if (!read.names) err(EX_OSERR, "realloc"); + read.ptrs = realloc(read.ptrs, sizeof(*read.ptrs) * read.cap); + if (!read.ptrs) err(EX_OSERR, "realloc"); } - reader.names[reader.len] = strdup(name); - if (!reader.names[reader.len]) err(EX_OSERR, "strdup"); - reader.reads[reader.len] = 0; - return reader.len++; + read.names[read.len] = strdup(name); + if (!read.names[read.len]) err(EX_OSERR, "strdup"); + read.ptrs[read.len] = 0; + return read.len++; +} + +size_t ringDiff(size_t reader) { + assert(reader < read.len); + return ring.write - read.ptrs[reader]; +} + +const char *ringRead(time_t *time, size_t reader) { + assert(reader < read.len); + if (!ringDiff(reader)) return NULL; + if (ringDiff(reader) > RingLen) { + read.ptrs[reader] = ring.write - RingLen; + } + size_t i = read.ptrs[reader]++ % RingLen; + if (time) *time = ring.times[i]; + return ring.lines[i]; } -- cgit 1.4.1 /a>/doc/zlib/gzdirect.3 (unfollow)
Commit message (Collapse)Author
2022-07-03Add The Bone Shard EmperorJune McEnroe
Suffers a little bit from middle book but I really enjoyed it. Read it faster than the first one too, despite its length.
2022-06-25Bump xterm font size to 12June McEnroe
2022-06-10Handle subshells (and functions) inside substitutionsJune McEnroe
2022-06-10Switch to jorts Install scriptJune McEnroe
2022-06-08Indicate if still reading or no resultsJune McEnroe
2022-06-08Add Maiden, Mother, CroneJune McEnroe
Mixed bag like most collections of short stories. Some of them are pretty good. The author of the worst written story also has the worst written bio.
2022-06-05FIRST SHOW IN 2.5 YEARS BABEY!!!June McEnroe
2022-06-03Set line number on File linesJune McEnroe
2022-06-03Stop polling stdin after EOFJune McEnroe
2022-06-02Set TABSIZE=4June McEnroe
Absolutely indiscriminately.
2022-06-02Do basic match highlightingJune McEnroe
2022-06-02Clean up parsing a littleJune McEnroe
2022-06-02Don't duplicate path stringJune McEnroe
2022-06-02Use stderr instead of /dev/tty, realloc buffer if lines too longJune McEnroe
For some reason I haven't been able to figure out, trying to poll /dev/tty returns POLLNVAL (and this was using 100% CPU looping), but using stderr instead works fine.
2022-06-02Add initial working version of qfJune McEnroe
2022-05-29Set prompt for okshJune McEnroe