*
* 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 <stdarg.h>
+
+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
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;
*****************************************************************************/
VLC_EXPORT( void, __msg_Generic, ( vlc_object_t *, int, int, const char *, const char *, ... ) ATTRIBUTE_FORMAT( 5, 6 ) );
VLC_EXPORT( void, __msg_GenericVa, ( vlc_object_t *, int, int, const char *, const char *, va_list args ) );
-#define msg_GenericVa(a, b, c, d, e),f __msg_GenericVa(VLC_OBJECT(a), b, c, d, e,f)
+#define msg_GenericVa(a, b, c, d, e,f) __msg_GenericVa(VLC_OBJECT(a), b, c, d, e,f)
VLC_EXPORT( void, __msg_Info, ( vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
VLC_EXPORT( void, __msg_Err, ( vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
VLC_EXPORT( void, __msg_Warn, ( vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
* @{
*/
+/****************************
+ * Generic stats stuff
+ ****************************/
enum
{
STATS_LAST,
STATS_COUNTER,
STATS_MAX,
STATS_MIN,
+ STATS_DERIVATIVE,
+ STATS_TIMER
};
struct counter_sample_t
struct counter_t
{
+ /* The list is *NOT* sorted at the moment, it could be ... */
+ uint64_t i_index;
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;
+};
+
+enum
+{
+ 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_WALK,
+ STATS_TIMER_INTERACTION,
+ STATS_TIMER_PREPARSE,
+
+ STATS_TIMER_SKINS_PLAYTREE_IMAGE,
};
struct stats_handler_t
{
VLC_COMMON_MEMBERS
- int i_counters;
- counter_t **pp_counters;
+ int i_counters;
+ counter_t **pp_counters;
};
-#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) );
+VLC_EXPORT( void, stats_HandlerDestroy, (stats_handler_t*) );
+
+#define stats_Update(a,b,c,d) __stats_Update( VLC_OBJECT( a ), b, c, d )
+VLC_EXPORT( int, __stats_Update, (vlc_object_t*, unsigned int, vlc_value_t, vlc_value_t *) );
+#define stats_Create(a,b,c,d,e) __stats_Create( VLC_OBJECT(a), b, c, d,e )
+VLC_EXPORT( int, __stats_Create, (vlc_object_t*, const char *, unsigned int, int, int) );
+#define stats_Get(a,b,c,d) __stats_Get( VLC_OBJECT(a), b, c, d )
+VLC_EXPORT( int, __stats_Get, (vlc_object_t*, int, unsigned int, 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, unsigned int ) );
+
+#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,
+ unsigned int i_counter, int *value )
+{
+ vlc_value_t val;
+ int i_ret = __stats_Get( p_obj, i_id, i_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,d) __stats_GetFloat( VLC_OBJECT(a), b, c, d )
+static inline int __stats_GetFloat( vlc_object_t *p_obj, int i_id,
+ unsigned int i_counter, float *value )
{
vlc_value_t val;
+ int i_ret = __stats_Get( p_obj, i_id, i_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,
+ unsigned int i_counter, int i,
+ int *pi_new )
+{
+ int i_ret;
+ vlc_value_t val;
+ vlc_value_t new_val;
val.i_int = i;
- return __stats_Update( p_obj, psz_name, val );
+ i_ret = __stats_Update( p_obj, i_counter, 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,
+ unsigned int i_counter, float f,
+ float *pf_new )
+{
+ vlc_value_t val;
+ int i_ret;
+ vlc_value_t new_val;
+ val.f_float = f;
+ i_ret = __stats_Update( p_obj, i_counter, 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;
+
+ /* 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*) );
projects / vlc / blobdiff