author | Tero Marttila <terom@fixme.fi> |
Thu, 28 May 2009 01:17:36 +0300 | |
branch | new-lib-errors |
changeset 219 | cefec18b8268 |
parent 217 | 7728d6ec3abf |
permissions | -rw-r--r-- |
90
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
1 |
#include "irc_queue.h" |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
2 |
#include "log.h" |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
3 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
4 |
#include <stdlib.h> |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
5 |
#include <string.h> |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
6 |
#include <time.h> |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
7 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
8 |
/** |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
9 |
* Send a formatted line on the line_proto, and apply the IRC_QUEUE_PENALTY to the timer, resetting it to the current |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
10 |
* time if it's fallen behind. |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
11 |
*/ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
12 |
static err_t irc_queue_send_buf (struct irc_queue *queue, const char *line_buf) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
13 |
{ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
14 |
time_t now = time(NULL); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
15 |
err_t err; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
16 |
int ret; |
151
b0b01420b99d
don't log newlines in irc_queue_send_buf
Tero Marttila <terom@fixme.fi>
parents:
102
diff
changeset
|
17 |
|
b0b01420b99d
don't log newlines in irc_queue_send_buf
Tero Marttila <terom@fixme.fi>
parents:
102
diff
changeset
|
18 |
// dump for debug output, without any newline |
b0b01420b99d
don't log newlines in irc_queue_send_buf
Tero Marttila <terom@fixme.fi>
parents:
102
diff
changeset
|
19 |
log_debug("%.*s", (int) (strstr(line_buf, "\r\n") - line_buf), line_buf); |
90
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
20 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
21 |
// XXX: output buffering? |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
22 |
if ((ret = line_proto_send(queue->lp, line_buf)) < 0) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
23 |
return (err = -ret); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
24 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
25 |
// reset timer to current time if it's fallen behind |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
26 |
if (queue->timer < now) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
27 |
queue->timer = now; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
28 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
29 |
// apply penalty |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
30 |
queue->timer += IRC_QUEUE_PENALTY; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
31 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
32 |
// ok |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
33 |
return SUCCESS; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
34 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
35 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
36 |
/** |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
37 |
* Pump the queue, sending the next message. If it is given explicitly, then the given message is "pumped", and it is |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
38 |
* assumed to not be in the queue_list. Otherwise, the next entry is taken from the queue. |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
39 |
* |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
40 |
* If the queue is empty and no entry is given, does nothing. |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
41 |
*/ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
42 |
static err_t irc_queue_pump (struct irc_queue *queue, struct irc_queue_entry *next) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
43 |
{ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
44 |
err_t err; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
45 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
46 |
// pop the next entry? |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
47 |
if (next == NULL) { |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
48 |
// take it from the head of the list |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
49 |
next = TAILQ_FIRST(&queue->list); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
50 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
51 |
// nothing to do? |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
52 |
if (!next) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
53 |
return SUCCESS; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
54 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
55 |
// and then remove it |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
56 |
TAILQ_REMOVE(&queue->list, next, queue_list); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
57 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
58 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
59 |
// send it |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
60 |
if ((err = irc_queue_send_buf(queue, next->line_buf))) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
61 |
goto error; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
62 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
63 |
// ok, release it |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
64 |
free(next); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
65 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
66 |
// done |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
67 |
return SUCCESS; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
68 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
69 |
error: |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
70 |
// hmm... re-insert and return error, we can try again later |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
71 |
TAILQ_INSERT_HEAD(&queue->list, next, queue_list); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
72 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
73 |
return err; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
74 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
75 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
76 |
/** |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
77 |
* Schedule the queue's timer for execution once the timer has expired, or immediately if it's not full. If next is |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
78 |
* given, it should be the next entry to send, and not part of the queue_list. |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
79 |
*/ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
80 |
static err_t irc_queue_schedule (struct irc_queue *queue) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
81 |
{ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
82 |
time_t now = time(NULL); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
83 |
struct timeval tv; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
84 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
85 |
// calculate the timeout |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
86 |
int timeout = (queue->timer - (now + IRC_QUEUE_WINDOW)); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
87 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
88 |
// setup the timeout, zero if we don't actually need to wait... |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
89 |
tv.tv_sec = timeout > 0 ? timeout : 0; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
90 |
tv.tv_usec = 0; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
91 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
92 |
// setup the timer event |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
93 |
if (evtimer_add(queue->ev, &tv)) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
94 |
return ERR_EVENT_ADD; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
95 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
96 |
// ok |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
97 |
return SUCCESS; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
98 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
99 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
100 |
/** |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
101 |
* Our timer callback |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
102 |
*/ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
103 |
static void irc_queue_timer (int fd, short what, void *arg) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
104 |
{ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
105 |
time_t now = time(NULL); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
106 |
struct irc_queue *queue = arg; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
107 |
err_t err; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
108 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
109 |
(void) fd; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
110 |
(void) what; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
111 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
112 |
// pump the queue until our timer is full again, or the queue is empty |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
113 |
while (queue->timer <= now + IRC_QUEUE_WINDOW && !TAILQ_EMPTY(&queue->list)) { |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
114 |
if ((err = irc_queue_pump(queue, NULL))) { |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
115 |
log_warn("irc_queue_pump: %s", error_name(err)); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
116 |
break; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
117 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
118 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
119 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
120 |
// reschedule if needed |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
121 |
if (!TAILQ_EMPTY(&queue->list)) { |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
122 |
if ((err = irc_queue_schedule(queue))) { |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
123 |
log_err(err, "irc_queue_scheulde"); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
124 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
125 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
126 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
127 |
|
217 | 128 |
err_t irc_queue_create (struct irc_queue **queue_ptr, struct event_base *ev_base, struct line_proto *lp, error_t *err) |
90
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
129 |
{ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
130 |
struct irc_queue *queue; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
131 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
132 |
// alloc |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
133 |
if ((queue = calloc(1, sizeof(*queue))) == NULL) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
134 |
return SET_ERROR(err, ERR_CALLOC); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
135 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
136 |
// create the timer event |
155
c59d3eaff0fb
most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents:
151
diff
changeset
|
137 |
if ((queue->ev = evtimer_new(ev_base, &irc_queue_timer, queue)) == NULL) |
90
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
138 |
JUMP_SET_ERROR(err, ERR_EVENT_NEW); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
139 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
140 |
// initialize |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
141 |
queue->lp = lp; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
142 |
queue->timer = time(NULL); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
143 |
TAILQ_INIT(&queue->list); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
144 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
145 |
// ok |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
146 |
*queue_ptr = queue; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
147 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
148 |
return SUCCESS; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
149 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
150 |
error: |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
151 |
// cleanup |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
152 |
free(queue); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
153 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
154 |
return ERROR_CODE(err); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
155 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
156 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
157 |
/** |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
158 |
* Attempt to send a irc_line directly on the queue's line_proto, otherwise enqueueing it for later transmission. |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
159 |
*/ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
160 |
static err_t irc_queue_send_direct (struct irc_queue *queue, const struct irc_line *line) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
161 |
{ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
162 |
char line_buf[IRC_LINE_MAX + 2]; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
163 |
err_t err; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
164 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
165 |
// format |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
166 |
if ((err = irc_line_build(line, line_buf))) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
167 |
return err; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
168 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
169 |
// add CRLF |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
170 |
strcat(line_buf, "\r\n"); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
171 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
172 |
// send |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
173 |
// XXX: handle send-buffer-full by enqueuing it after all |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
174 |
return irc_queue_send_buf(queue, line_buf); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
175 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
176 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
177 |
/** |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
178 |
* Enqueue a irc_line onto the queue's list, and schedule the timer for execution |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
179 |
*/ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
180 |
static err_t irc_queue_put (struct irc_queue *queue, const struct irc_line *line) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
181 |
{ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
182 |
struct irc_queue_entry *entry; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
183 |
err_t err; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
184 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
185 |
// alloc |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
186 |
if ((entry = calloc(1, sizeof(*entry))) == NULL) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
187 |
return ERR_CALLOC; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
188 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
189 |
// format |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
190 |
if ((err = irc_line_build(line, entry->line_buf))) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
191 |
goto error; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
192 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
193 |
// add CRLF |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
194 |
strcat(entry->line_buf, "\r\n"); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
195 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
196 |
// then re-schedule the queue |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
197 |
if ((err = irc_queue_schedule(queue))) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
198 |
goto error; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
199 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
200 |
// append to end of list |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
201 |
TAILQ_INSERT_TAIL(&queue->list, entry, queue_list); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
202 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
203 |
// ok |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
204 |
return SUCCESS; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
205 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
206 |
error: |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
207 |
// cleanup |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
208 |
free(entry); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
209 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
210 |
return err; |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
211 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
212 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
213 |
err_t irc_queue_process (struct irc_queue *queue, const struct irc_line *line) |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
214 |
{ |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
215 |
// current time |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
216 |
time_t now = time(NULL); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
217 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
218 |
if (queue->timer < now + IRC_QUEUE_WINDOW) { |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
219 |
// timer is OK, send directly |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
220 |
return irc_queue_send_direct(queue, line); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
221 |
|
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
222 |
} else { |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
223 |
// enqueue for later transmission |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
224 |
return irc_queue_put(queue, line); |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
225 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
226 |
} |
9d489b1039b2
implement irc_queue, with some basic functionality tests
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
227 |
|
91
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
228 |
void irc_queue_destroy (struct irc_queue *queue) |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
229 |
{ |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
230 |
struct irc_queue_entry *entry, *next; |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
231 |
|
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
232 |
// free all entries |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
233 |
for (entry = TAILQ_FIRST(&queue->list); entry; entry = next) { |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
234 |
next = TAILQ_NEXT(entry, queue_list); |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
235 |
free(entry); |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
236 |
} |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
237 |
|
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
238 |
// the event |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
239 |
event_free(queue->ev); |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
240 |
|
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
241 |
// the queue itself |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
242 |
free(queue); |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
243 |
} |
bca23cbe1dce
implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents:
90
diff
changeset
|
244 |