kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 04:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "stasic.c: Fix printf format type mismatches with arguments." into 16

Browse Source
This commit is contained in:
Joshua C. Colp
2019-01-03 05:41:25 -06:00
committed by Gerrit Code Review
parent 92ee1bdfbb f196078705
commit 1e9da4dba6
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
main/stasis.c
View File

@@ -339,14 +339,14 @@ static AST_VECTOR(, struct stasis_message_type_statistics) message_type_statisti
/*! \internal */ /*! \internal */
struct stasis_topic_statistics { struct stasis_topic_statistics {
/*! \brief Highest time spent dispatching messages to subscribers */
long highest_time_dispatched;
/*! \brief Lowest time spent dispatching messages to subscribers */
long lowest_time_dispatched;
/*! \brief The number of messages that were not dispatched to any subscriber */ /*! \brief The number of messages that were not dispatched to any subscriber */
int messages_not_dispatched; int messages_not_dispatched;
/*! \brief The number of messages that were dispatched to at least 1 subscriber */ /*! \brief The number of messages that were dispatched to at least 1 subscriber */
int messages_dispatched; int messages_dispatched;
/*! \brief Highest time spent dispatching messages to subscribers */
int64_t highest_time_dispatched;
/*! \brief Lowest time spent dispatching messages to subscribers */
int64_t lowest_time_dispatched;
/*! \brief The number of subscribers to this topic */ /*! \brief The number of subscribers to this topic */
int subscriber_count; int subscriber_count;
/*! \brief Name of the topic */ /*! \brief Name of the topic */
@@ -461,26 +461,26 @@ size_t stasis_topic_subscribers(const struct stasis_topic *topic)
struct stasis_subscription_statistics { struct stasis_subscription_statistics {
/*! \brief The filename where the subscription originates */ /*! \brief The filename where the subscription originates */
const char *file; const char *file;
/*! \brief The line number where the subscription originates */
int lineno;
/*! \brief The function where the subscription originates */ /*! \brief The function where the subscription originates */
const char *func; const char *func;
/*! \brief Name of the topic we subscribed to */
char *topic;
/*! \brief The message type that currently took the longest to process */
struct stasis_message_type *highest_time_message_type;
/*! \brief Highest time spent invoking a message */
long highest_time_invoked;
/*! \brief Lowest time spent invoking a message */
long lowest_time_invoked;
/*! \brief The number of messages that were filtered out */ /*! \brief The number of messages that were filtered out */
int messages_dropped; int messages_dropped;
/*! \brief The number of messages that passed filtering */ /*! \brief The number of messages that passed filtering */
int messages_passed; int messages_passed;
/*! \brief Highest time spent invoking a message */
int64_t highest_time_invoked;
/*! \brief The message type that currently took the longest to process */
struct stasis_message_type *highest_time_message_type;
/*! \brief Lowest time spent invoking a message */
int64_t lowest_time_invoked;
/*! \brief Using a mailbox to queue messages */ /*! \brief Using a mailbox to queue messages */
int uses_mailbox; int uses_mailbox;
/*! \brief Using stasis threadpool for handling messages */ /*! \brief Using stasis threadpool for handling messages */
int uses_threadpool; int uses_threadpool;
/*! \brief Name of the topic we subscribed to */ /*! \brief The line number where the subscription originates */
char *topic; int lineno;
/*! \brief Unique ID of the subscription */ /*! \brief Unique ID of the subscription */
char uniqueid[0]; char uniqueid[0];
}; };
@@ -561,7 +561,7 @@ static void subscription_invoke(struct stasis_subscription *sub,
int message_type_id = stasis_message_type_id(stasis_subscription_change_type()); int message_type_id = stasis_message_type_id(stasis_subscription_change_type());
#ifdef AST_DEVMODE #ifdef AST_DEVMODE
struct timeval start; struct timeval start;
int elapsed; long elapsed;
start = ast_tvnow(); start = ast_tvnow();
#endif #endif
@@ -1243,7 +1243,7 @@ static void publish_msg(struct stasis_topic *topic,
int message_type_id = stasis_message_type_id(stasis_message_type(message)); int message_type_id = stasis_message_type_id(stasis_message_type(message));
struct stasis_message_type_statistics *statistics; struct stasis_message_type_statistics *statistics;
struct timeval start; struct timeval start;
int elapsed; long elapsed;
#endif #endif
ast_assert(topic != NULL); ast_assert(topic != NULL);