[Asterisk-code-review] app_dial.c: RINGTIME, PROGRESSTIME and ms resolution dial timings (...asterisk[13])
Friendly Automation
asteriskteam at digium.com
Thu Apr 25 14:06:07 CDT 2019
Friendly Automation has submitted this change and it was merged. ( https://gerrit.asterisk.org/c/asterisk/+/11207 )
Change subject: app_dial.c: RINGTIME, PROGRESSTIME and ms resolution dial timings
......................................................................
app_dial.c: RINGTIME, PROGRESSTIME and ms resolution dial timings
Added RINGTIME, RINGTIME_MS, PROGRESSTIME, PROGRESSTIME_MS variables filled
at the earliest received PROGRESS or RINGING.
Added millisecond versions of DIALEDTIME and ANSWEREDTIME.
Added millisecond versions of ast_channel_get_up_time and
ast_channel_get_duration in channel.c.
ASTERISK-28363
Change-Id: If95f1a7d8c4acbac740037de0c6e3109ff6620b1
---
M apps/app_dial.c
A doc/CHANGES-staging/app_dial_ringtime_progresstime.txt
M include/asterisk/channel.h
M main/channel.c
4 files changed, 129 insertions(+), 12 deletions(-)
Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 714108b..77b3ace 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -564,9 +564,27 @@
<variable name="DIALEDTIME">
<para>This is the time from dialing a channel until when it is disconnected.</para>
</variable>
+ <variable name="DIALEDTIME_MS">
+ <para>This is the milliseconds version of the DIALEDTIME variable.</para>
+ </variable>
<variable name="ANSWEREDTIME">
<para>This is the amount of time for actual call.</para>
</variable>
+ <variable name="ANSWEREDTIME_MS">
+ <para>This is the milliseconds version of the ANSWEREDTIME variable.</para>
+ </variable>
+ <variable name="RINGTIME">
+ <para>This is the time from creating the channel to the first RINGING event received. Empty if there was no ring.</para>
+ </variable>
+ <variable name="RINGTIME_MS">
+ <para>This is the milliseconds version of the RINGTIME variable.</para>
+ </variable>
+ <variable name="PROGRESSTIME">
+ <para>This is the time from creating the channel to the first PROGRESS event received. Empty if there was no such event.</para>
+ </variable>
+ <variable name="PROGRESSTIME_MS">
+ <para>This is the milliseconds version of the PROGRESSTIME variable.</para>
+ </variable>
<variable name="DIALEDPEERNAME">
<para>The name of the outbound channel that answered the call.</para>
</variable>
@@ -1159,6 +1177,23 @@
ast_party_connected_line_free(&connected_caller);
}
+/*!
+ * \internal
+ * \pre chan is locked
+ */
+static void set_duration_var(struct ast_channel *chan, const char *var_base, int64_t duration)
+{
+ char buf[32];
+ char full_var_name[128];
+
+ snprintf(buf, sizeof(buf), "%" PRId64, duration / 1000);
+ pbx_builtin_setvar_helper(chan, var_base, buf);
+
+ snprintf(full_var_name, sizeof(full_var_name), "%s_MS", var_base);
+ snprintf(buf, sizeof(buf), "%" PRId64, duration);
+ pbx_builtin_setvar_helper(chan, full_var_name, buf);
+}
+
static struct ast_channel *wait_for_answer(struct ast_channel *in,
struct dial_head *out_chans, int *to, struct ast_flags64 *peerflags,
char *opt_args[],
@@ -1184,6 +1219,8 @@
int is_cc_recall;
int cc_frame_received = 0;
int num_ringing = 0;
+ int sent_ring = 0;
+ int sent_progress = 0;
struct timeval start = ast_tvnow();
if (single) {
@@ -1466,6 +1503,23 @@
ast_indicate(in, AST_CONTROL_RINGING);
pa->sentringing++;
}
+ if (!sent_ring) {
+ struct timeval now, then;
+ int64_t diff;
+
+ now = ast_tvnow();
+
+ ast_channel_lock(in);
+ ast_channel_stage_snapshot(in);
+
+ then = ast_channel_creationtime(c);
+ diff = ast_tvzero(then) ? 0 : ast_tvdiff_ms(now, then);
+ set_duration_var(in, "RINGTIME", diff);
+
+ ast_channel_stage_snapshot_done(in);
+ ast_channel_unlock(in);
+ sent_ring = 1;
+ }
}
break;
case AST_CONTROL_PROGRESS:
@@ -1480,6 +1534,23 @@
ast_indicate(in, AST_CONTROL_PROGRESS);
}
}
+ if (!sent_progress) {
+ struct timeval now, then;
+ int64_t diff;
+
+ now = ast_tvnow();
+
+ ast_channel_lock(in);
+ ast_channel_stage_snapshot(in);
+
+ then = ast_channel_creationtime(c);
+ diff = ast_tvzero(then) ? 0 : ast_tvdiff_ms(now, then);
+ set_duration_var(in, "PROGRESSTIME", diff);
+
+ ast_channel_stage_snapshot_done(in);
+ ast_channel_unlock(in);
+ sent_progress = 1;
+ }
if (!ast_strlen_zero(dtmf_progress)) {
ast_verb(3,
"Sending DTMF '%s' to the called party as result of receiving a PROGRESS message.\n",
@@ -2071,18 +2142,12 @@
static void end_bridge_callback(void *data)
{
- char buf[80];
- time_t end;
struct ast_channel *chan = data;
- time(&end);
-
ast_channel_lock(chan);
ast_channel_stage_snapshot(chan);
- snprintf(buf, sizeof(buf), "%d", ast_channel_get_up_time(chan));
- pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
- snprintf(buf, sizeof(buf), "%d", ast_channel_get_duration(chan));
- pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
+ set_duration_var(chan, "ANSWEREDTIME", ast_channel_get_up_time_ms(chan));
+ set_duration_var(chan, "DIALEDTIME", ast_channel_get_duration_ms(chan));
ast_channel_stage_snapshot_done(chan);
ast_channel_unlock(chan);
}
@@ -2224,7 +2289,13 @@
pbx_builtin_setvar_helper(chan, "DIALEDPEERNUMBER", "");
pbx_builtin_setvar_helper(chan, "DIALEDPEERNAME", "");
pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", "");
+ pbx_builtin_setvar_helper(chan, "ANSWEREDTIME_MS", "");
pbx_builtin_setvar_helper(chan, "DIALEDTIME", "");
+ pbx_builtin_setvar_helper(chan, "DIALEDTIME_MS", "");
+ pbx_builtin_setvar_helper(chan, "RINGTIME", "");
+ pbx_builtin_setvar_helper(chan, "RINGTIME_MS", "");
+ pbx_builtin_setvar_helper(chan, "PROGRESSTIME", "");
+ pbx_builtin_setvar_helper(chan, "PROGRESSTIME_MS", "");
ast_channel_stage_snapshot_done(chan);
max_forwards = ast_max_forwards_get(chan);
ast_channel_unlock(chan);
diff --git a/doc/CHANGES-staging/app_dial_ringtime_progresstime.txt b/doc/CHANGES-staging/app_dial_ringtime_progresstime.txt
new file mode 100644
index 0000000..9b5cdd5
--- /dev/null
+++ b/doc/CHANGES-staging/app_dial_ringtime_progresstime.txt
@@ -0,0 +1,12 @@
+Subject: Dial
+
+Add RINGTIME and RINGTIME_MS variables containing respectively seconds and
+milliseconds between creation of the dialing channel and receiving the first
+RINGING signal
+
+Add PROGRESSTIME and PROGRESSTIME_MS variables analogous to the above with respect to
+the PROGRESS signal. Shorter of these two times should be equivalent to
+the PDD (Post Dial Delay) value
+
+Add DIALEDTIME_MS and ANSWEREDTIME_MS variables to get millisecond resolution
+versions of DIALEDTIME and ANSWEREDTIME
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 0ab12e7..cf46538 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -2339,6 +2339,18 @@
void ast_deactivate_generator(struct ast_channel *chan);
/*!
+ * \since 13.27.0
+ * \since 16.4.0
+ * \brief Obtain how long it's been, in milliseconds, since the channel was created
+ *
+ * \param chan The channel object
+ *
+ * \retval 0 if the time value cannot be computed (or you called this really fast)
+ * \retval The number of milliseconds since channel creation
+ */
+int64_t ast_channel_get_duration_ms(struct ast_channel *chan);
+
+/*!
* \since 12
* \brief Obtain how long the channel since the channel was created
*
@@ -2350,6 +2362,18 @@
int ast_channel_get_duration(struct ast_channel *chan);
/*!
+ * \since 13.27.0
+ * \since 16.4.0
+ * \brief Obtain how long it has been since the channel was answered in ms
+ *
+ * \param chan The channel object
+ *
+ * \retval 0 if the channel isn't answered (or you called this really fast)
+ * \retval The number of milliseconds the channel has been up
+ */
+int64_t ast_channel_get_up_time_ms(struct ast_channel *chan);
+
+/*!
* \since 12
* \brief Obtain how long it has been since the channel was answered
*
diff --git a/main/channel.c b/main/channel.c
index 07b1521..e95eac0 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2941,24 +2941,34 @@
return ast_answer(chan);
}
-int ast_channel_get_duration(struct ast_channel *chan)
+int64_t ast_channel_get_duration_ms(struct ast_channel *chan)
{
ast_assert(NULL != chan);
if (ast_tvzero(ast_channel_creationtime(chan))) {
return 0;
}
- return (ast_tvdiff_ms(ast_tvnow(), ast_channel_creationtime(chan)) / 1000);
+ return ast_tvdiff_ms(ast_tvnow(), ast_channel_creationtime(chan));
}
-int ast_channel_get_up_time(struct ast_channel *chan)
+int ast_channel_get_duration(struct ast_channel *chan)
+{
+ return (ast_channel_get_duration_ms(chan) / 1000);
+}
+
+int64_t ast_channel_get_up_time_ms(struct ast_channel *chan)
{
ast_assert(NULL != chan);
if (ast_tvzero(ast_channel_answertime(chan))) {
return 0;
}
- return (ast_tvdiff_ms(ast_tvnow(), ast_channel_answertime(chan)) / 1000);
+ return ast_tvdiff_ms(ast_tvnow(), ast_channel_answertime(chan));
+}
+
+int ast_channel_get_up_time(struct ast_channel *chan)
+{
+ return (ast_channel_get_up_time_ms(chan) / 1000);
}
static void deactivate_generator_nolock(struct ast_channel *chan)
--
To view, visit https://gerrit.asterisk.org/c/asterisk/+/11207
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Change-Id: If95f1a7d8c4acbac740037de0c6e3109ff6620b1
Gerrit-Change-Number: 11207
Gerrit-PatchSet: 7
Gerrit-Owner: Antoni Goldstein <action at gdevel.com>
Gerrit-Reviewer: Antoni Goldstein <action at gdevel.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190425/7ae850b7/attachment-0001.html>
More information about the asterisk-code-review
mailing list