* This library provides basic functions for threads to interact with user
* interface, such as message output.
*****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: vlc_messages.h,v 1.10 2003/12/04 17:15:59 gbazin Exp $
+ * Copyright (C) 1999, 2000, 2001, 2002 the VideoLAN team
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*****************************************************************************/
#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
char * psz_module;
char * psz_msg; /**< the message itself */
-#if 0
- mtime_t date; /* date of the message */
- char * psz_file; /* file in which the function was called */
- char * psz_function; /* function from which the function was called */
- int i_line; /* line at which the function was called */
-#endif
+ mtime_t date; /**< Message date */
} msg_item_t;
/* Message types */
/** standard messages */
-#define VLC_MSG_INFO 0
+#define VLC_MSG_INFO 0
/** error messages */
-#define VLC_MSG_ERR 1
+#define VLC_MSG_ERR 1
/** warning messages */
#define VLC_MSG_WARN 2
/** debug messages */
#define VLC_MSG_DBG 3
+#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;
+};
+
+struct msg_queue_t
+{
+ int i_id;
+
/** Message queue lock */
vlc_mutex_t lock;
- vlc_bool_t b_configured;
vlc_bool_t b_overflow;
/* Message queue */
/*****************************************************************************
* Prototypes
*****************************************************************************/
-VLC_EXPORT( void, __msg_Generic, ( vlc_object_t *, int, const char *, const char *, ... ) ATTRIBUTE_FORMAT( 4, 5 ) );
-VLC_EXPORT( void, __msg_GenericVa, ( vlc_object_t *, int, const char *, const char *, va_list args ) );
+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)
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 ) );
#ifdef HAVE_VARIADIC_MACROS
# define msg_Info( p_this, psz_format, args... ) \
- __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_INFO, MODULE_STRING, \
+ __msg_Generic( VLC_OBJECT(p_this), MSG_QUEUE_NORMAL,VLC_MSG_INFO, MODULE_STRING, \
psz_format, ## args )
# define msg_Err( p_this, psz_format, args... ) \
- __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_ERR, MODULE_STRING, \
+ __msg_Generic( VLC_OBJECT(p_this), MSG_QUEUE_NORMAL, VLC_MSG_ERR, MODULE_STRING, \
psz_format, ## args )
# define msg_Warn( p_this, psz_format, args... ) \
- __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_WARN, MODULE_STRING, \
+ __msg_Generic( VLC_OBJECT(p_this), MSG_QUEUE_NORMAL, VLC_MSG_WARN, MODULE_STRING, \
psz_format, ## args )
# define msg_Dbg( p_this, psz_format, args... ) \
- __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_DBG, MODULE_STRING, \
+ __msg_Generic( VLC_OBJECT(p_this), MSG_QUEUE_NORMAL, VLC_MSG_DBG, MODULE_STRING, \
psz_format, ## args )
#elif defined(_MSC_VER) /* To avoid warnings and even errors with c++ files */
{
va_list ap;
va_start( ap, psz_format );
- __msg_GenericVa( ( vlc_object_t *)p_this, VLC_MSG_INFO, MODULE_STRING,
+ __msg_GenericVa( ( vlc_object_t *)p_this, MSG_QUEUE_NORMAL,VLC_MSG_INFO, MODULE_STRING,
psz_format, ap );
va_end(ap);
}
{
va_list ap;
va_start( ap, psz_format );
- __msg_GenericVa( ( vlc_object_t *)p_this, VLC_MSG_ERR, MODULE_STRING,
+ __msg_GenericVa( ( vlc_object_t *)p_this,MSG_QUEUE_NORMAL, VLC_MSG_ERR, MODULE_STRING,
psz_format, ap );
va_end(ap);
}
{
va_list ap;
va_start( ap, psz_format );
- __msg_GenericVa( ( vlc_object_t *)p_this, VLC_MSG_WARN, MODULE_STRING,
+ __msg_GenericVa( ( vlc_object_t *)p_this, MSG_QUEUE_NORMAL, VLC_MSG_WARN, MODULE_STRING,
psz_format, ap );
va_end(ap);
}
{
va_list ap;
va_start( ap, psz_format );
- __msg_GenericVa( ( vlc_object_t *)p_this, VLC_MSG_DBG, MODULE_STRING,
+ __msg_GenericVa( ( vlc_object_t *)p_this, MSG_QUEUE_NORMAL, VLC_MSG_DBG, MODULE_STRING,
psz_format, ap );
va_end(ap);
}
void __msg_Flush ( vlc_object_t * );
void __msg_Destroy ( vlc_object_t * );
-#define msg_Subscribe(a) __msg_Subscribe(VLC_OBJECT(a))
+#define msg_Subscribe(a,b) __msg_Subscribe(VLC_OBJECT(a),b)
#define msg_Unsubscribe(a,b) __msg_Unsubscribe(VLC_OBJECT(a),b)
-VLC_EXPORT( msg_subscription_t*, __msg_Subscribe, ( 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 * ) );
/**
* @}
*/
+
+/**
+ * \defgroup statistics Statistics
+ *
+ * @{
+ */
+
+enum
+{
+ STATS_LAST,
+ STATS_COUNTER,
+ STATS_MAX,
+ STATS_MIN,
+ STATS_DERIVATIVE
+};
+
+struct counter_sample_t
+{
+ vlc_value_t value;
+ mtime_t date;
+};
+
+struct counter_t
+{
+ char * psz_name;
+ int i_source_object;
+ int i_compute_type;
+ 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;
+};
+
+#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_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*) );
+#define stats_CounterGet( a,b,c) __stats_CounterGet( VLC_OBJECT(a), b, c )
+VLC_EXPORT( counter_t*, __stats_CounterGet, (vlc_object_t*, int, 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 )
+{
+ vlc_value_t val;
+ int i_ret = __stats_Get( p_obj, i_id, psz_name, &val );
+ *value = val.i_int;
+ 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,
+ 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 )
+{
+ 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, char *psz_name,
+ float f )
+{
+ vlc_value_t val;
+ val.f_float = f;
+ return __stats_Update( p_obj, psz_name, val );
+}
+
+struct input_stats_t
+{
+
+ vlc_mutex_t lock;
+
+ /* Input */
+ int i_read_packets;
+ int i_read_bytes;
+
+ float f_bitrate;
+
+ float f_average_bitrate;
+
+ /* Decoders */
+
+ /* Vout */
+ int i_displayed_pictures;
+ int i_lost_pictures;
+};
+
+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 *) );
projects / vlc / blobdiff