mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston: Rename weston_debug_scope to weston_log_scope

Browse Source 
This is a continuation of the previous patch to align more closely to
the weston log framework.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
dev
Marius Vlad 6 years ago committed by Daniel Stone
parent 3d7d978c21
commit 5d5e335845
6 changed files with 43 additions and 43 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      compositor/main.c
  2. 2
      include/libweston/libweston.h
  3. 2
      libweston/compositor-drm.c
  4. 52
      libweston/weston-debug.c
  5. 24
      libweston/weston-debug.h
  6. 2
      xwayland/xwayland.h

4
compositor/main.c
Unescape View File

@ -122,8 +122,8 @@ struct wet_compositor {
}; };
static FILE *weston_logfile = NULL; static FILE *weston_logfile = NULL;
static struct weston_debug_scope *log_scope; static struct weston_log_scope *log_scope;
static struct weston_debug_scope *protocol_scope; static struct weston_log_scope *protocol_scope;
static int cached_tm_mday = -1; static int cached_tm_mday = -1;

2
include/libweston/libweston.h
Unescape View File

@ -1168,7 +1168,7 @@ struct weston_compositor {
struct weston_touch_calibrator *touch_calibrator; struct weston_touch_calibrator *touch_calibrator;
struct weston_log_context *weston_log_ctx; struct weston_log_context *weston_log_ctx;
struct weston_debug_scope *debug_scene; struct weston_log_scope *debug_scene;
}; };
struct weston_buffer { struct weston_buffer {

2
libweston/compositor-drm.c
Unescape View File

@ -354,7 +354,7 @@ struct drm_backend {
bool fb_modifiers; bool fb_modifiers;
struct weston_debug_scope *debug; struct weston_log_scope *debug;
}; };
struct drm_mode { struct drm_mode {

52
libweston/weston-debug.c
Unescape View File

@ -49,19 +49,19 @@ struct weston_log_context {
struct weston_compositor *compositor; struct weston_compositor *compositor;
struct wl_listener compositor_destroy_listener; struct wl_listener compositor_destroy_listener;
struct wl_global *global; struct wl_global *global;
struct wl_list scope_list; /**< weston_debug_scope::compositor_link */ struct wl_list scope_list; /**< weston_log_scope::compositor_link */
}; };
/** weston-debug message scope /** weston-log message scope
* *
* This is used for scoping debugging messages. Clients can subscribe to * This is used for scoping debugging messages. Clients can subscribe to
* only the scopes they are interested in. A scope is identified by its name * only the scopes they are interested in. A scope is identified by its name
* (also referred to as debug stream name). * (also referred to as debug stream name).
*/ */
struct weston_debug_scope { struct weston_log_scope {
char *name; char *name;
char *desc; char *desc;
weston_debug_scope_cb begin_cb; weston_log_scope_cb begin_cb;
void *user_data; void *user_data;
struct wl_list stream_list; /**< weston_debug_stream::scope_link */ struct wl_list stream_list; /**< weston_debug_stream::scope_link */
struct wl_list compositor_link; struct wl_list compositor_link;
@ -71,7 +71,7 @@ struct weston_debug_scope {
* *
* A client provides a file descriptor for the server to write debug * A client provides a file descriptor for the server to write debug
* messages into. A weston_debug_stream is associated to one * messages into. A weston_debug_stream is associated to one
* weston_debug_scope via the scope name, and the scope provides the messages. * weston_log_scope via the scope name, and the scope provides the messages.
* There can be several streams for the same scope, all streams getting the * There can be several streams for the same scope, all streams getting the
* same messages. * same messages.
*/ */
@ -81,10 +81,10 @@ struct weston_debug_stream {
struct wl_list scope_link; struct wl_list scope_link;
}; };
static struct weston_debug_scope * static struct weston_log_scope *
get_scope(struct weston_log_context *log_ctx, const char *name) get_scope(struct weston_log_context *log_ctx, const char *name)
{ {
struct weston_debug_scope *scope; struct weston_log_scope *scope;
wl_list_for_each(scope, &log_ctx->scope_list, compositor_link) wl_list_for_each(scope, &log_ctx->scope_list, compositor_link)
if (strcmp(name, scope->name) == 0) if (strcmp(name, scope->name) == 0)
@ -132,7 +132,7 @@ stream_create(struct weston_log_context *log_ctx, const char *name,
int32_t streamfd, struct wl_resource *stream_resource) int32_t streamfd, struct wl_resource *stream_resource)
{ {
struct weston_debug_stream *stream; struct weston_debug_stream *stream;
struct weston_debug_scope *scope; struct weston_log_scope *scope;
stream = zalloc(sizeof *stream); stream = zalloc(sizeof *stream);
if (!stream) if (!stream)
@ -234,7 +234,7 @@ bind_weston_debug(struct wl_client *client,
void *data, uint32_t version, uint32_t id) void *data, uint32_t version, uint32_t id)
{ {
struct weston_log_context *log_ctx = data; struct weston_log_context *log_ctx = data;
struct weston_debug_scope *scope; struct weston_log_scope *scope;
struct wl_resource *resource; struct wl_resource *resource;
resource = wl_resource_create(client, resource = wl_resource_create(client,
@ -308,7 +308,7 @@ WL_EXPORT void
weston_log_ctx_compositor_destroy(struct weston_compositor *compositor) weston_log_ctx_compositor_destroy(struct weston_compositor *compositor)
{ {
struct weston_log_context *log_ctx = compositor->weston_log_ctx; struct weston_log_context *log_ctx = compositor->weston_log_ctx;
struct weston_debug_scope *scope; struct weston_log_scope *scope;
if (log_ctx->global) if (log_ctx->global)
wl_global_destroy(log_ctx->global); wl_global_destroy(log_ctx->global);
@ -402,17 +402,17 @@ weston_compositor_is_debug_protocol_enabled(struct weston_compositor *wc)
* The debug scope must be destroyed before destroying the * The debug scope must be destroyed before destroying the
* \c weston_compositor. * \c weston_compositor.
* *
* \memberof weston_debug_scope * \memberof weston_log_scope
* \sa weston_debug_stream, weston_debug_scope_cb * \sa weston_debug_stream, weston_log_scope_cb
*/ */
WL_EXPORT struct weston_debug_scope * WL_EXPORT struct weston_log_scope *
weston_compositor_add_debug_scope(struct weston_log_context *log_ctx, weston_compositor_add_debug_scope(struct weston_log_context *log_ctx,
const char *name, const char *name,
const char *description, const char *description,
weston_debug_scope_cb begin_cb, weston_log_scope_cb begin_cb,
void *user_data) void *user_data)
{ {
struct weston_debug_scope *scope; struct weston_log_scope *scope;
if (!name || !description) { if (!name || !description) {
weston_log("Error: cannot add a debug scope without name or description.\n"); weston_log("Error: cannot add a debug scope without name or description.\n");
@ -465,10 +465,10 @@ weston_compositor_add_debug_scope(struct weston_log_context *log_ctx,
* Destroys the log scope, closing all open streams subscribed to it and * Destroys the log scope, closing all open streams subscribed to it and
* sending them each a \c weston_debug_stream_v1.failure event. * sending them each a \c weston_debug_stream_v1.failure event.
* *
* \memberof weston_debug_scope * \memberof weston_log_scope
*/ */
WL_EXPORT void WL_EXPORT void
weston_debug_scope_destroy(struct weston_debug_scope *scope) weston_debug_scope_destroy(struct weston_log_scope *scope)
{ {
struct weston_debug_stream *stream; struct weston_debug_stream *stream;
@ -507,10 +507,10 @@ weston_debug_scope_destroy(struct weston_debug_scope *scope)
* scope is initialized to NULL before creation and set to NULL after * scope is initialized to NULL before creation and set to NULL after
* destruction. * destruction.
* *
* \memberof weston_debug_scope * \memberof weston_log_scope
*/ */
WL_EXPORT bool WL_EXPORT bool
weston_debug_scope_is_enabled(struct weston_debug_scope *scope) weston_debug_scope_is_enabled(struct weston_log_scope *scope)
{ {
if (!scope) if (!scope)
return false; return false;
@ -638,10 +638,10 @@ weston_debug_stream_complete(struct weston_debug_stream *stream)
* The behavioral details for each stream are the same as for * The behavioral details for each stream are the same as for
* weston_debug_stream_write(). * weston_debug_stream_write().
* *
* \memberof weston_debug_scope * \memberof weston_log_scope
*/ */
WL_EXPORT void WL_EXPORT void
weston_debug_scope_write(struct weston_debug_scope *scope, weston_debug_scope_write(struct weston_log_scope *scope,
const char *data, size_t len) const char *data, size_t len)
{ {
struct weston_debug_stream *stream; struct weston_debug_stream *stream;
@ -665,10 +665,10 @@ weston_debug_scope_write(struct weston_debug_scope *scope,
* The behavioral details for each stream are the same as for * The behavioral details for each stream are the same as for
* weston_debug_stream_write(). * weston_debug_stream_write().
* *
* \memberof weston_debug_scope * \memberof weston_log_scope
*/ */
WL_EXPORT void WL_EXPORT void
weston_debug_scope_vprintf(struct weston_debug_scope *scope, weston_debug_scope_vprintf(struct weston_log_scope *scope,
const char *fmt, va_list ap) const char *fmt, va_list ap)
{ {
static const char oom[] = "Out of memory"; static const char oom[] = "Out of memory";
@ -698,10 +698,10 @@ weston_debug_scope_vprintf(struct weston_debug_scope *scope,
* The behavioral details for each stream are the same as for * The behavioral details for each stream are the same as for
* weston_debug_stream_write(). * weston_debug_stream_write().
* *
* \memberof weston_debug_scope * \memberof weston_log_scope
*/ */
WL_EXPORT void WL_EXPORT void
weston_debug_scope_printf(struct weston_debug_scope *scope, weston_debug_scope_printf(struct weston_log_scope *scope,
const char *fmt, ...) const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -723,7 +723,7 @@ weston_debug_scope_printf(struct weston_debug_scope *scope,
* The string is NUL-terminated, even if truncated. * The string is NUL-terminated, even if truncated.
*/ */
WL_EXPORT char * WL_EXPORT char *
weston_debug_scope_timestamp(struct weston_debug_scope *scope, weston_debug_scope_timestamp(struct weston_log_scope *scope,
char *buf, size_t len) char *buf, size_t len)
{ {
struct timeval tv; struct timeval tv;

24
libweston/weston-debug.h
Unescape View File

@ -44,44 +44,44 @@ weston_compositor_enable_debug_protocol(struct weston_compositor *);
bool bool
weston_compositor_is_debug_protocol_enabled(struct weston_compositor *); weston_compositor_is_debug_protocol_enabled(struct weston_compositor *);
struct weston_debug_scope; struct weston_log_scope;
struct weston_debug_stream; struct weston_debug_stream;
/** weston_debug_scope callback /** weston_log_scope callback
* *
* \param stream The debug stream. * \param stream The debug stream.
* \param user_data The \c user_data argument given to * \param user_data The \c user_data argument given to
* weston_compositor_add_debug_scope() * weston_compositor_add_debug_scope()
* *
* \memberof weston_debug_scope * \memberof weston_log_scope
* \sa weston_debug_stream * \sa weston_debug_stream
*/ */
typedef void (*weston_debug_scope_cb)(struct weston_debug_stream *stream, typedef void (*weston_log_scope_cb)(struct weston_debug_stream *stream,
void *user_data); void *user_data);
struct weston_debug_scope * struct weston_log_scope *
weston_compositor_add_debug_scope(struct weston_log_context *compositor, weston_compositor_add_debug_scope(struct weston_log_context *compositor,
const char *name, const char *name,
const char *description, const char *description,
weston_debug_scope_cb begin_cb, weston_log_scope_cb begin_cb,
void *user_data); void *user_data);
void void
weston_debug_scope_destroy(struct weston_debug_scope *scope); weston_debug_scope_destroy(struct weston_log_scope *scope);
bool bool
weston_debug_scope_is_enabled(struct weston_debug_scope *scope); weston_debug_scope_is_enabled(struct weston_log_scope *scope);
void void
weston_debug_scope_write(struct weston_debug_scope *scope, weston_debug_scope_write(struct weston_log_scope *scope,
const char *data, size_t len); const char *data, size_t len);
void void
weston_debug_scope_vprintf(struct weston_debug_scope *scope, weston_debug_scope_vprintf(struct weston_log_scope *scope,
const char *fmt, va_list ap); const char *fmt, va_list ap);
void void
weston_debug_scope_printf(struct weston_debug_scope *scope, weston_debug_scope_printf(struct weston_log_scope *scope,
const char *fmt, ...) const char *fmt, ...)
__attribute__ ((format (printf, 2, 3))); __attribute__ ((format (printf, 2, 3)));
@ -102,7 +102,7 @@ void
weston_debug_stream_complete(struct weston_debug_stream *stream); weston_debug_stream_complete(struct weston_debug_stream *stream);
char * char *
weston_debug_scope_timestamp(struct weston_debug_scope *scope, weston_debug_scope_timestamp(struct weston_log_scope *scope,
char *buf, size_t len); char *buf, size_t len);
#ifdef __cplusplus #ifdef __cplusplus

2
xwayland/xwayland.h
Unescape View File

@ -54,7 +54,7 @@ struct weston_xserver {
weston_xwayland_spawn_xserver_func_t spawn_func; weston_xwayland_spawn_xserver_func_t spawn_func;
void *user_data; void *user_data;
struct weston_debug_scope *wm_debug; struct weston_log_scope *wm_debug;
}; };
struct weston_wm { struct weston_wm {

Write Preview
Loading…
Cancel
Save