<p>Sean Bright has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11626">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[WIP] manager: Send fewer packets<br><br>Change-Id: I50128b0769060ca5272dbbb5e60242d131eaddf9<br>---<br>M main/manager.c<br>1 file changed, 70 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/26/11626/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/manager.c b/main/manager.c</span><br><span>index 0efb030..35094fe 100644</span><br><span>--- a/main/manager.c</span><br><span>+++ b/main/manager.c</span><br><span>@@ -3042,6 +3042,15 @@</span><br><span> /*! \brief initial allocated size for the astman_append_buf and astman_send_*_va */</span><br><span> #define ASTMAN_APPEND_BUF_INITSIZE 256</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void astman_flush(struct mansession *s, struct ast_str *buf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s->f || s->session->f) {</span><br><span style="color: hsl(120, 100%, 40%);">+ send_string(s, ast_str_buffer(buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_verbose("fd == -1 in astman_append, should not happen\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*!</span><br><span> * utility functions for creating AMI replies</span><br><span> */</span><br><span>@@ -3091,21 +3100,33 @@</span><br><span> static void astman_send_response_full(struct mansession *s, const struct message *m, char *resp, char *msg, char *listflag)</span><br><span> {</span><br><span> const char *id = astman_get_header(m, "ActionID");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_str *buf;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- astman_append(s, "Response: %s\r\n", resp);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ast_strlen_zero(id)) {</span><br><span style="color: hsl(0, 100%, 40%);">- astman_append(s, "ActionID: %s\r\n", id);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (listflag) {</span><br><span style="color: hsl(0, 100%, 40%);">- astman_append(s, "EventList: %s\r\n", listflag); /* Start, complete, cancelled */</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg == MSG_MOREDATA) {</span><br><span style="color: hsl(120, 100%, 40%);">+ buf = ast_str_thread_get(&astman_append_buf, ASTMAN_APPEND_BUF_INITSIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!buf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Log something? */</span><br><span> return;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (msg) {</span><br><span style="color: hsl(0, 100%, 40%);">- astman_append(s, "Message: %s\r\n\r\n", msg);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- astman_append(s, "\r\n");</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_set(&buf, 0, "Response: %s\r\n", resp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_strlen_zero(id)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&buf, 0, "ActionID: %s\r\n", id);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (listflag) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Start, complete, cancelled */</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&buf, 0, "EventList: %s\r\n", listflag);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg != MSG_MOREDATA) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&buf, 0, "Message: %s\r\n", msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&buf, 0, "\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ astman_flush(s, buf);</span><br><span> }</span><br><span> </span><br><span> void astman_send_response(struct mansession *s, const struct message *m, char *resp, char *msg)</span><br><span>@@ -3160,18 +3181,49 @@</span><br><span> astman_send_response_full(s, m, "Success", msg, listflag);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* TODO: De-dupe */</span><br><span style="color: hsl(120, 100%, 40%);">+static void astman_send_list_complete(struct mansession *s, const struct message *m, const char *event_name, int count)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *id = astman_get_header(m, "ActionID");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_str *buf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ buf = ast_str_thread_get(&astman_append_buf, ASTMAN_APPEND_BUF_INITSIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!buf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Log something? */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_set(&buf, 0, "Event: %s\r\n", event_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_strlen_zero(id)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&buf, 0, "ActionID: %s\r\n", id);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&buf, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ "EventList: Complete\r\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "ListItems: %d\r\n\r\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ count);</span><br><span style="color: hsl(120, 100%, 40%);">+ astman_flush(s, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void astman_send_list_complete_start(struct mansession *s, const struct message *m, const char *event_name, int count)</span><br><span> {</span><br><span> const char *id = astman_get_header(m, "ActionID");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_str *buf;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- astman_append(s, "Event: %s\r\n", event_name);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ast_strlen_zero(id)) {</span><br><span style="color: hsl(0, 100%, 40%);">- astman_append(s, "ActionID: %s\r\n", id);</span><br><span style="color: hsl(120, 100%, 40%);">+ buf = ast_str_thread_get(&astman_append_buf, ASTMAN_APPEND_BUF_INITSIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!buf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Log something? */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- astman_append(s,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_set(&buf, 0, "Event: %s\r\n", event_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_strlen_zero(id)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&buf, 0, "ActionID: %s\r\n", id);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&buf, 0,</span><br><span> "EventList: Complete\r\n"</span><br><span> "ListItems: %d\r\n",</span><br><span> count);</span><br><span style="color: hsl(120, 100%, 40%);">+ astman_flush(s, buf);</span><br><span> }</span><br><span> </span><br><span> void astman_send_list_complete_end(struct mansession *s)</span><br><span>@@ -4483,8 +4535,7 @@</span><br><span> regfree(®exbuf);</span><br><span> ast_free(regex_string);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- astman_send_list_complete_start(s, m, "ChannelsHungupListComplete", channels_matched);</span><br><span style="color: hsl(0, 100%, 40%);">- astman_send_list_complete_end(s);</span><br><span style="color: hsl(120, 100%, 40%);">+ astman_send_list_complete(s, m, "ChannelsHungupListComplete", channels_matched);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -6289,8 +6340,7 @@</span><br><span> }</span><br><span> ao2_iterator_destroy(&it_chans);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- astman_send_list_complete_start(s, m, "CoreShowChannelsComplete", numchans);</span><br><span style="color: hsl(0, 100%, 40%);">- astman_send_list_complete_end(s);</span><br><span style="color: hsl(120, 100%, 40%);">+ astman_send_list_complete(s, m, "CoreShowChannelsComplete", numchans);</span><br><span> </span><br><span> ao2_ref(channels, -1);</span><br><span> return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11626">change 11626</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/11626"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-Change-Id: I50128b0769060ca5272dbbb5e60242d131eaddf9 </div>
<div style="display:none"> Gerrit-Change-Number: 11626 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>