X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_messages.h;h=b1f2fbd6947c7066e150c8a237770d185a75f60f;hb=8d995e6f088eeee7d5ee5896b23c0a1347b27256;hp=4027fa510e6d88c7d05b98ded52b0560cc0aecf9;hpb=e56193e811c52c1f0945524e47f0f9aa4069d5e0;p=vlc diff --git a/include/vlc_messages.h b/include/vlc_messages.h index 4027fa510e..b1f2fbd694 100644 --- a/include/vlc_messages.h +++ b/include/vlc_messages.h @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #include @@ -47,7 +47,8 @@ typedef struct int i_object_id; int i_object_type; char * psz_module; - char * psz_msg; /**< the message itself */ + char * psz_msg; /**< the message itself */ + char * psz_header; /**< Additional header */ mtime_t date; /**< Message date */ } msg_item_t; @@ -206,13 +207,17 @@ VLC_EXPORT( void, __msg_Unsubscribe, ( vlc_object_t *, msg_subscription_t * ) ); * @{ */ +/**************************** + * Generic stats stuff + ****************************/ enum { STATS_LAST, STATS_COUNTER, STATS_MAX, STATS_MIN, - STATS_DERIVATIVE + STATS_DERIVATIVE, + STATS_TIMER }; struct counter_sample_t @@ -229,26 +234,33 @@ struct counter_t int i_type; int i_samples; counter_sample_t ** pp_samples; + + mtime_t update_interval; + mtime_t last_update; }; struct stats_handler_t { VLC_COMMON_MEMBERS - int i_counters; - counter_t **pp_counters; + int i_counters; + hashtable_entry_t * p_counters; }; +VLC_EXPORT( void, stats_HandlerDestroy, (stats_handler_t*) ); + #define stats_Update( a,b,c) __stats_Update( VLC_OBJECT( a ), b, c ) -VLC_EXPORT( int, __stats_Update, (vlc_object_t*, char *, vlc_value_t) ); +VLC_EXPORT( int, __stats_Update, (vlc_object_t*, const char *, vlc_value_t) ); #define stats_Create( a,b,c,d ) __stats_Create( VLC_OBJECT(a), b, c, d ) -VLC_EXPORT( int, __stats_Create, (vlc_object_t*, char *, int, int) ); +VLC_EXPORT( int, __stats_Create, (vlc_object_t*, const char *, int, int) ); #define stats_Get( a,b,c,d ) __stats_Create( VLC_OBJECT(a), b, c, d ) -VLC_EXPORT( int, __stats_Get, (vlc_object_t*, int, char *, vlc_value_t*) ); +VLC_EXPORT( int, __stats_Get, (vlc_object_t*, int, const char *, vlc_value_t*) ); +#define stats_CounterGet( a,b,c) __stats_CounterGet( VLC_OBJECT(a), b, c ) +VLC_EXPORT( counter_t*, __stats_CounterGet, (vlc_object_t*, int, const char * ) ); #define stats_GetInteger( a,b,c,d ) __stats_GetInteger( VLC_OBJECT(a), b, c, d ) static inline int __stats_GetInteger( vlc_object_t *p_obj, int i_id, - char *psz_name, int *value ) + const char *psz_name, int *value ) { vlc_value_t val; int i_ret = __stats_Get( p_obj, i_id, psz_name, &val ); @@ -256,16 +268,35 @@ static inline int __stats_GetInteger( vlc_object_t *p_obj, int i_id, return i_ret; } +#define stats_GetFloat(a,b,c,d ) __stats_GetFloat( VLC_OBJECT(a), b, c, d ) +static inline int __stats_GetFloat( vlc_object_t *p_obj, int i_id, + const char *psz_name, float *value ) +{ + vlc_value_t val; + int i_ret = __stats_Get( p_obj, i_id, psz_name, &val ); + *value = val.f_float; + return i_ret; +} #define stats_UpdateInteger( a,b,c ) __stats_UpdateInteger( VLC_OBJECT(a),b,c ) -static inline int __stats_UpdateInteger( vlc_object_t *p_obj, char *psz_name, - int i ) +static inline int __stats_UpdateInteger( vlc_object_t *p_obj, + const char *psz_name, int i ) { vlc_value_t val; val.i_int = i; return __stats_Update( p_obj, psz_name, val ); } +#define stats_UpdateFloat( a,b,c ) __stats_UpdateFloat( VLC_OBJECT(a),b,c ) +static inline int __stats_UpdateFloat( vlc_object_t *p_obj, + const char *psz_name, float f ) +{ + vlc_value_t val; + val.f_float = f; + return __stats_Update( p_obj, psz_name, val ); +} - +/****************** + * Input stats + ******************/ struct input_stats_t { @@ -274,17 +305,70 @@ struct input_stats_t /* Input */ int i_read_packets; int i_read_bytes; + float f_input_bitrate; + float f_average_input_bitrate; - float f_last_bitrate; - float f_average_bitrate; + /* Demux */ + int i_demux_read_packets; + int i_demux_read_bytes; + float f_demux_bitrate; + float f_average_demux_bitrate; /* Decoders */ + int i_decoded_audio; + int i_decoded_video; /* Vout */ int i_displayed_pictures; int i_lost_pictures; + + /* Sout */ + int i_sent_packets; + int i_sent_bytes; + float f_send_bitrate; + + /* Aout */ + int i_played_abuffers; + int i_lost_abuffers; }; VLC_EXPORT( void, stats_ComputeInputStats, (input_thread_t*, input_stats_t*) ); VLC_EXPORT( void, stats_ReinitInputStats, (input_stats_t *) ); VLC_EXPORT( void, stats_DumpInputStats, (input_stats_t *) ); + +/******************** + * Global stats + *******************/ +struct global_stats_t +{ + vlc_mutex_t lock; + + float f_input_bitrate; + float f_demux_bitrate; + float f_output_bitrate; + + int i_http_clients; +}; + +#define stats_ComputeGlobalStats( a,b) __stats_ComputeGlobalStats( VLC_OBJECT(a),b) +VLC_EXPORT( void, __stats_ComputeGlobalStats, (vlc_object_t*,global_stats_t*)); + + +/********* + * Timing + ********/ +#ifdef DEBUG +#define stats_TimerStart(a,b) __stats_TimerStart( VLC_OBJECT(a), b ) +#define stats_TimerStop(a,b) __stats_TimerStop( VLC_OBJECT(a), b ) +#define stats_TimerDump(a,b) __stats_TimerDump( VLC_OBJECT(a), b ) +#define stats_TimersDumpAll(a) __stats_TimersDumpAll( VLC_OBJECT(a) ) +#else +#define stats_TimerStart(a,b) {} +#define stats_TimerStop(a,b) {} +#define stats_TimerDump(a,b) {} +#define stats_TimersDumpAll(a) {} +#endif +VLC_EXPORT( void,__stats_TimerStart, (vlc_object_t*, const char *) ); +VLC_EXPORT( void,__stats_TimerStop, (vlc_object_t*, const char *) ); +VLC_EXPORT( void,__stats_TimerDump, (vlc_object_t*, const char *) ); +VLC_EXPORT( void,__stats_TimersDumpAll, (vlc_object_t*) );