X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_messages.h;h=2e0a3f39652abe161c09d921b7cb3bbcff7a0195;hb=a5ed35c9b0d7588e63e41e05c938f31a96277b9e;hp=c8f5f5bf84176db2ba94e974e3c7bb03340395d9;hpb=91c8dba080d1e67f93964f510e6fb18b15a1bc5b;p=vlc diff --git a/include/vlc_messages.h b/include/vlc_messages.h index c8f5f5bf84..2e0a3f3965 100644 --- a/include/vlc_messages.h +++ b/include/vlc_messages.h @@ -21,10 +21,14 @@ * * 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 + +int vlc_mutex_lock( vlc_mutex_t * ) ; +int vlc_mutex_unlock( vlc_mutex_t * ) ; + /** * \defgroup messages Messages * This library provides basic functions for threads to interact with user @@ -43,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; @@ -60,16 +65,7 @@ typedef struct #define MSG_QUEUE_NORMAL 0 #define MSG_QUEUE_HTTPD_ACCESS 1 - -/** - * Store all data requiered by messages interfaces. - */ -struct msg_bank_t -{ - vlc_mutex_t lock; - int i_queues; - msg_queue_t **pp_queues; -}; +#define NB_QUEUES 2 struct msg_queue_t { @@ -94,6 +90,15 @@ struct msg_queue_t #endif }; +/** + * Store all data requiered by messages interfaces. + */ +struct msg_bank_t +{ + vlc_mutex_t lock; + msg_queue_t queues[NB_QUEUES]; +}; + /** * Used by interface plugins which subscribe to the message bank. */ @@ -191,6 +196,7 @@ void __msg_Destroy ( vlc_object_t * ); VLC_EXPORT( msg_subscription_t*, __msg_Subscribe, ( vlc_object_t *, int ) ); VLC_EXPORT( void, __msg_Unsubscribe, ( vlc_object_t *, msg_subscription_t * ) ); +const char *msg_GetObjectTypeName(int i_object_type ); /** * @} @@ -202,13 +208,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 @@ -219,49 +229,183 @@ struct counter_sample_t struct counter_t { + unsigned int i_id; char * psz_name; - int i_source_object; - int i_compute_type; int i_type; + int i_compute_type; int i_samples; counter_sample_t ** pp_samples; + + mtime_t update_interval; + mtime_t last_update; }; -struct stats_handler_t +enum { - VLC_COMMON_MEMBERS - - int i_counters; - counter_t **pp_counters; + STATS_INPUT_BITRATE, + STATS_READ_BYTES, + STATS_READ_PACKETS, + STATS_DEMUX_READ, + STATS_DEMUX_BITRATE, + STATS_PLAYED_ABUFFERS, + STATS_LOST_ABUFFERS, + STATS_DECODED_AUDIO, + STATS_DECODED_VIDEO, + STATS_DECODED_SUB, + STATS_CLIENT_CONNECTIONS, + STATS_ACTIVE_CONNECTIONS, + STATS_SOUT_SENT_PACKETS, + STATS_SOUT_SENT_BYTES, + STATS_SOUT_SEND_BITRATE, + STATS_DISPLAYED_PICTURES, + STATS_LOST_PICTURES, + + STATS_TIMER_PLAYLIST_BUILD, + STATS_TIMER_ML_LOAD, + STATS_TIMER_ML_DUMP, + STATS_TIMER_INTERACTION, + STATS_TIMER_PREPARSE, + + STATS_TIMER_SKINS_PLAYTREE_IMAGE, }; -#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) ); -#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) ); +#define stats_Update(a,b,c) __stats_Update( VLC_OBJECT(a), b, c ) +VLC_EXPORT( int, __stats_Update, (vlc_object_t*, counter_t *, vlc_value_t, vlc_value_t *) ); +#define stats_CounterCreate(a,b,c) __stats_CounterCreate( VLC_OBJECT(a), b, c ) +VLC_EXPORT( counter_t *, __stats_CounterCreate, (vlc_object_t*, int, int) ); +#define stats_Get(a,b,c) __stats_Get( VLC_OBJECT(a), b, c) +VLC_EXPORT( int, __stats_Get, (vlc_object_t*, counter_t *, vlc_value_t*) ); + +VLC_EXPORT (void, stats_CounterClean, (counter_t * ) ); + +#define stats_GetInteger(a,b,c) __stats_GetInteger( VLC_OBJECT(a), b, c ) +static inline int __stats_GetInteger( vlc_object_t *p_obj, counter_t *p_counter, + int *value ) +{ + int i_ret; + vlc_value_t val; val.i_int = 0; + if( !p_counter ) return VLC_EGENERIC; + i_ret = __stats_Get( p_obj, p_counter, &val ); + *value = val.i_int; + return i_ret; +} -static inline int __stats_UpdateInteger( vlc_object_t *p_obj, char *psz_name, - int i ) +#define stats_GetFloat(a,b,c) __stats_GetFloat( VLC_OBJECT(a), b, c ) +static inline int __stats_GetFloat( vlc_object_t *p_obj, counter_t *p_counter, + float *value ) { + int i_ret; + vlc_value_t val; val.f_float = 0.0; + if( !p_counter ) return VLC_EGENERIC; + i_ret = __stats_Get( p_obj, p_counter, &val ); + *value = val.f_float; + return i_ret; +} +#define stats_UpdateInteger(a,b,c,d) __stats_UpdateInteger( VLC_OBJECT(a),b,c,d ) +static inline int __stats_UpdateInteger( vlc_object_t *p_obj,counter_t *p_co, + int i, int *pi_new ) +{ + int i_ret; vlc_value_t val; + vlc_value_t new_val; new_val.i_int = 0; + if( !p_co ) return VLC_EGENERIC; val.i_int = i; - return __stats_Update( p_obj, psz_name, val ); + i_ret = __stats_Update( p_obj, p_co, val, &new_val ); + if( pi_new ) + *pi_new = new_val.i_int; + return i_ret; +} +#define stats_UpdateFloat(a,b,c,d) __stats_UpdateFloat( VLC_OBJECT(a),b,c,d ) +static inline int __stats_UpdateFloat( vlc_object_t *p_obj, counter_t *p_co, + float f, float *pf_new ) +{ + vlc_value_t val; + int i_ret; + vlc_value_t new_val;new_val.f_float = 0.0; + if( !p_co ) return VLC_EGENERIC; + val.f_float = f; + i_ret = __stats_Update( p_obj, p_co, val, &new_val ); + if( pf_new ) + *pf_new = new_val.f_float; + return i_ret; } -#define stats_UpdateInteger( a,b,c ) __stats_UpdateInteger( VLC_OBJECT(a),b,c ) - +/****************** + * Input stats + ******************/ struct input_stats_t { + vlc_mutex_t lock; + /* 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,c) __stats_TimerStart( VLC_OBJECT(a), b,c ) +#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,c) {} +#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 *, unsigned int ) ); +VLC_EXPORT( void,__stats_TimerStop, (vlc_object_t*, unsigned int) ); +VLC_EXPORT( void,__stats_TimerDump, (vlc_object_t*, unsigned int) ); +VLC_EXPORT( void,__stats_TimersDumpAll, (vlc_object_t*) ); +#define stats_TimersClean(a) __stats_TimersClean( VLC_OBJECT(a) ) +VLC_EXPORT( void, __stats_TimersClean, (vlc_object_t * ) );