* Taeheon Kim <th908.kim@samsung.com>,
* YoungJun Cho <yj44.cho@samsung.com>,
* SooChan Lim <sc1.lim@samsung.com>,
- * Boram Park <sc1.lim@samsung.com>
+ * Boram Park <boram1288.park@samsung.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
#include <stdlib.h>
#include <time.h>
#include <strings.h>
+#include <poll.h>
#include <tdm-client-protocol.h>
typedef struct _tdm_private_client_vblank tdm_private_client_vblank;
typedef struct _tdm_private_client {
+ pthread_mutex_t lock;
+
struct wl_display *display;
+ struct wl_event_queue *queue;
struct wl_registry *registry;
struct wl_tdm *tdm;
struct list_head output_list;
+ unsigned int enable_ttrace;
+ unsigned int stamp;
+
tdm_private_client_vblank *temp_vblank;
} tdm_private_client;
void *user_data;
struct list_head link;
+ struct list_head call_link;
} tdm_client_output_handler_info;
typedef struct _tdm_client_wait_info {
int need_free;
struct list_head link;
+ struct list_head call_link;
} tdm_client_wait_info;
+static unsigned int
+_tdm_client_check_wl_error(tdm_private_client *private_client, const char *func, int line)
+{
+ uint32_t ec, id;
+ const struct wl_interface *intf;
+ int err;
+
+ err = wl_display_get_error(private_client->display);
+ if (!err)
+ return false;
+
+ if (err == EINVAL || err == ENOMEM || err == EFAULT || err == EPROTO) {
+ ec = wl_display_get_protocol_error(private_client->display, &intf, &id);
+ TDM_ERR("[%s,%d] errno(%d) Got protocol error '%u' on interface '%s' (object '%u')",
+ func, line, err, ec, (intf) ? intf->name : "destroyed", id);
+ } else {
+ TDM_ERR("[%s,%d] errno(%d)", func, line, err);
+ }
+
+ return true;
+}
+
+#define CHECK_WL_PROTOCOL_ERROR(pc) _tdm_client_check_wl_error(pc, __FUNCTION__, __LINE__)
+
static void
_tdm_client_vblank_cb_stamp(void *data, struct wl_tdm_vblank *wl_tdm_vblank, uint32_t stamp)
{
tdm_private_client_vblank *private_vblank = data;
+ tdm_private_client *private_client;
TDM_RETURN_IF_FAIL(private_vblank != NULL);
private_vblank->stamp = stamp;
+
+ TDM_RETURN_IF_FAIL(private_vblank->private_output != NULL);
+ private_client = private_vblank->private_output->private_client;
+
+ private_client->stamp = stamp;
}
/* LCOV_EXCL_START */
uint32_t tv_usec, uint32_t error)
{
tdm_private_client_vblank *private_vblank = data;
- tdm_client_wait_info *w = NULL, *ww = NULL;
+ tdm_private_client *private_client;
+ tdm_client_wait_info *w = NULL, *wait_info = NULL;
TDM_RETURN_IF_FAIL(private_vblank != NULL);
+ private_client = private_vblank->private_output->private_client;
+
private_vblank->last_time = TDM_TIME(tv_sec, tv_usec);
TDM_DBG("vblank(%p) req_id(%u) sequence(%u) time(%.6f)",
private_vblank, req_id, sequence, TDM_TIME(tv_sec, tv_usec));
- LIST_FOR_EACH_ENTRY_SAFE(w, ww, &private_vblank->wait_list, link) {
+ LIST_FOR_EACH_ENTRY(w, &private_vblank->wait_list, link) {
if (w->req_id != req_id)
continue;
- if (private_vblank->enable_ttrace)
- TDM_TRACE_ASYNC_END((int)w->req_time, "TDM_Client_Vblank:%u", private_vblank->stamp);
+ wait_info = w;
+ break;
+ }
- if (w->req_time >= private_vblank->last_time)
- TDM_WRN("'req(%.6f) < last(%.6f)' failed", w->req_time, private_vblank->last_time);
+ if (!wait_info) {
+ TDM_ERR("no wait infomation for req_id(%d)", req_id);
+ return;
+ }
- if (w->func)
- w->func(private_vblank, error, sequence, tv_sec, tv_usec, w->user_data);
+ if (private_vblank->enable_ttrace)
+ TDM_TRACE_ASYNC_END((int)wait_info->req_time, "TDM_Client_Vblank:%u", private_vblank->stamp);
- if (w->need_free) {
- LIST_DEL(&w->link);
- free(w);
- } else
- w->need_free = 1;
- return;
+ if (wait_info->req_time >= private_vblank->last_time)
+ TDM_WRN("'req(%.6f) < last(%.6f)' failed. error(%d)", wait_info->req_time, private_vblank->last_time, error);
+
+ if (wait_info->need_free)
+ LIST_DEL(&wait_info->link);
+
+ if (wait_info->func) {
+ pthread_mutex_unlock(&private_client->lock);
+ wait_info->func(private_vblank, error, sequence, tv_sec, tv_usec, wait_info->user_data);
+ pthread_mutex_lock(&private_client->lock);
}
+
+ if (wait_info->need_free)
+ free(w);
+ else
+ wait_info->need_free = 1;
}
/* LCOV_EXCL_STOP */
_tdm_client_vblank_cb_ttrace(void *data, struct wl_tdm_vblank *wl_tdm_vblank, uint32_t enable)
{
tdm_private_client_vblank *private_vblank = data;
+ tdm_private_client *private_client;
TDM_RETURN_IF_FAIL(private_vblank != NULL);
private_vblank->enable_ttrace = enable;
+
+ TDM_RETURN_IF_FAIL(private_vblank->private_output != NULL);
+ private_client = private_vblank->private_output->private_client;
+
+ private_client->enable_ttrace = enable;
}
/* LCOV_EXCL_STOP */
_tdm_client_output_cb_connection(void *data, struct wl_tdm_output *wl_tdm_output, uint32_t value, uint32_t error)
{
tdm_private_client_output *private_output = (tdm_private_client_output*)data;
- tdm_client_output_handler_info *h = NULL;
+ tdm_private_client *private_client;
+ tdm_client_output_handler_info *h = NULL, *hh = NULL;
tdm_value v;
+ struct list_head call_list;
TDM_RETURN_IF_FAIL(private_output != NULL);
+ private_client = private_output->private_client;
+
if (private_output->connection == value)
return;
wl_proxy_get_id((struct wl_proxy*)private_output->output),
value);
- v.u32 = value;
+ LIST_INITHEAD(&call_list);
+
LIST_FOR_EACH_ENTRY(h, &private_output->change_handler_list, link) {
+ LIST_ADDTAIL(&h->call_link, &call_list);
+ }
+
+ v.u32 = value;
+ pthread_mutex_unlock(&private_client->lock);
+ LIST_FOR_EACH_ENTRY_SAFE(h, hh, &call_list, call_link) {
if (h->func)
h->func(private_output, TDM_OUTPUT_CHANGE_CONNECTION, v, h->user_data);
}
+ pthread_mutex_lock(&private_client->lock);
}
static void
_tdm_client_output_cb_dpms(void *data, struct wl_tdm_output *wl_tdm_output, uint32_t value, uint32_t error)
{
tdm_private_client_output *private_output = (tdm_private_client_output*)data;
- tdm_client_output_handler_info *h = NULL;
+ tdm_private_client *private_client;
+ tdm_client_output_handler_info *h = NULL, *hh = NULL;
tdm_value v;
+ struct list_head call_list;
TDM_RETURN_IF_FAIL(private_output != NULL);
+ private_client = private_output->private_client;
+
/* If value is extended value, we handle it as DPMS on in client side
* The extended DPMS value is valid only in server side.
* Or, need to export to client side also?
wl_proxy_get_id((struct wl_proxy*)private_output->output),
value);
- v.u32 = value;
+ LIST_INITHEAD(&call_list);
+
LIST_FOR_EACH_ENTRY(h, &private_output->change_handler_list, link) {
+ LIST_ADDTAIL(&h->call_link, &call_list);
+ }
+
+ v.u32 = value;
+ pthread_mutex_unlock(&private_client->lock);
+ LIST_FOR_EACH_ENTRY_SAFE(h, hh, &call_list, call_link) {
if (h->func)
h->func(private_output, TDM_OUTPUT_CHANGE_DPMS, v, h->user_data);
}
+ pthread_mutex_lock(&private_client->lock);
}
static const struct wl_tdm_output_listener tdm_client_output_listener = {
/* LCOV_EXCL_STOP */
}
+ if (pthread_mutex_init(&private_client->lock, NULL)) {
+ TDM_ERR("mutex init failed: %m");
+ free(private_client);
+ if (error)
+ *error = TDM_ERROR_OUT_OF_MEMORY;
+ return NULL;
+ }
+
LIST_INITHEAD(&private_client->output_list);
private_client->display = wl_display_connect("tdm-socket");
TDM_GOTO_IF_FAIL(private_client->display != NULL, create_failed);
+ private_client->queue = wl_display_create_queue(private_client->display);
+ TDM_GOTO_IF_FAIL(private_client->queue != NULL, create_failed);
+
private_client->registry = wl_display_get_registry(private_client->display);
TDM_GOTO_IF_FAIL(private_client->registry != NULL, create_failed);
&tdm_client_registry_listener, private_client);
wl_display_roundtrip(private_client->display);
+ if (CHECK_WL_PROTOCOL_ERROR(private_client))
+ goto create_failed;
+
/* check global objects */
TDM_GOTO_IF_FAIL(private_client->tdm != NULL, create_failed);
if (!private_client)
return;
- if (private_client->temp_vblank)
+ pthread_mutex_lock(&private_client->lock);
+
+ if (private_client->temp_vblank) {
+ pthread_mutex_unlock(&private_client->lock);
tdm_client_vblank_destroy(private_client->temp_vblank);
+ pthread_mutex_lock(&private_client->lock);
+ }
LIST_FOR_EACH_ENTRY_SAFE(o, oo, &private_client->output_list, link) {
_tdm_client_output_destroy(o);
wl_tdm_destroy(private_client->tdm);
if (private_client->registry)
wl_registry_destroy(private_client->registry);
+ if (private_client->queue)
+ wl_event_queue_destroy(private_client->queue);
if (private_client->display)
wl_display_disconnect(private_client->display);
+ pthread_mutex_unlock(&private_client->lock);
+ pthread_mutex_destroy(&private_client->lock);
+
free(private_client);
}
private_client = (tdm_private_client*)client;
+ pthread_mutex_lock(&private_client->lock);
+
*fd = wl_display_get_fd(private_client->display);
+
+ pthread_mutex_unlock(&private_client->lock);
+
if (*fd < 0)
return TDM_ERROR_OPERATION_FAILED;
/* LCOV_EXCL_START */
private_client = (tdm_private_client*)client;
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ if (private_client->enable_ttrace)
+ TDM_TRACE_ASYNC_BEGIN((int)private_client->stamp, "TDM_Client_Events:%u", (unsigned int)private_client->stamp);
+
wl_display_dispatch(private_client->display);
+ if (private_client->enable_ttrace)
+ TDM_TRACE_ASYNC_END((int)private_client->stamp, "TDM_Client_Events:%u", (unsigned int)private_client->stamp);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
/* LCOV_EXCL_STOP */
}
+static int
+_tdm_client_poll(struct wl_display *display, short int events, int timeout)
+{
+ int ret;
+ struct pollfd pfd[1];
+
+ pfd[0].fd = wl_display_get_fd(display);
+ pfd[0].events = events;
+ do {
+ ret = poll(pfd, 1, timeout);
+ } while (ret == -1 && errno == EINTR);
+
+ return ret;
+}
+
+static tdm_error
+_tdm_client_dispatch_timeout(tdm_private_client *private_client, int timeout)
+{
+ int ret;
+ struct wl_display *display = private_client->display;
+
+ if (wl_display_prepare_read(display) == -1) {
+ if (wl_display_dispatch_pending(display) > 0)
+ return TDM_ERROR_NONE;
+ else
+ return TDM_ERROR_OPERATION_FAILED;
+ }
+
+ while (true) {
+ ret = wl_display_flush(display);
+
+ if (ret != -1 || errno != EAGAIN)
+ break;
+
+ if (_tdm_client_poll(display, POLLOUT, -1) == -1) {
+ wl_display_cancel_read(display);
+ TDM_ERR("_tdm_client_poll failed");
+ return TDM_ERROR_OPERATION_FAILED;
+ }
+ }
+
+ /* Don't stop if flushing hits an EPIPE; continue so we can read any
+ * protocol error that may have triggered it. */
+ if (ret < 0 && errno != EPIPE) {
+ TDM_ERR("ret(%d) errno(%d)", ret, errno);
+ wl_display_cancel_read(display);
+ return TDM_ERROR_OPERATION_FAILED;
+ }
+
+ ret = _tdm_client_poll(display, POLLIN, timeout);
+ if (ret <= 0) {
+ wl_display_cancel_read(display);
+ if (ret == 0) {
+ TDM_ERR("_tdm_client_poll timeout.");
+ return TDM_ERROR_TIMEOUT;
+ } else {
+ TDM_ERR("_tdm_client_poll failed. (ret:%d)", ret);
+ return TDM_ERROR_OPERATION_FAILED;
+ }
+ }
+
+ if (wl_display_read_events(display) == -1) {
+ TDM_ERR("wl_display_read_events failed");
+ return TDM_ERROR_OPERATION_FAILED;
+ }
+
+ ret = wl_display_dispatch_pending(display);
+
+ if (ret < 0) {
+ TDM_ERR("_tdm_client_dispatch_timeout failed");
+ return TDM_ERROR_OPERATION_FAILED;
+ }
+
+ return TDM_ERROR_NONE;
+}
+
+tdm_error
+tdm_client_handle_events_timeout(tdm_client *client, int ms_timeout)
+{
+ tdm_private_client *private_client;
+ tdm_error ret;
+ TDM_RETURN_VAL_IF_FAIL(client != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+ private_client = (tdm_private_client*)client;
+
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ if (private_client->enable_ttrace)
+ TDM_TRACE_ASYNC_BEGIN((int)private_client->stamp, "TDM_Client_Events_Timeout:%u", (unsigned int)private_client->stamp);
+
+ ret = _tdm_client_dispatch_timeout(private_client, ms_timeout);
+
+ if (private_client->enable_ttrace)
+ TDM_TRACE_ASYNC_END((int)private_client->stamp, "TDM_Client_Events_Timeout:%u", (unsigned int)private_client->stamp);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ pthread_mutex_unlock(&private_client->lock);
+
+ return ret;
+}
+
typedef struct _tdm_client_vblank_temp {
tdm_client_vblank_handler2 func;
void *user_data;
tdm_client_vblank_temp *vblank_temp = user_data;
TDM_RETURN_IF_FAIL(vblank_temp != NULL);
+ TDM_RETURN_IF_FAIL(vblank != NULL);
if (vblank_temp->func)
vblank_temp->func(sequence, tv_sec, tv_usec, vblank_temp->user_data);
TDM_RETURN_VAL_IF_FAIL(interval > 0, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
+ if (CHECK_WL_PROTOCOL_ERROR(private_client))
+ return TDM_ERROR_PROTOCOL_ERROR;
+
if (!private_client->temp_vblank) {
output = tdm_client_get_output(client, name, &ret);
TDM_RETURN_VAL_IF_FAIL(output != NULL, ret);
{
tdm_private_client *private_client;
tdm_private_client_output *private_output = NULL;
+ struct wl_proxy *wrapper;
if (error)
*error = TDM_ERROR_NONE;
private_client = (tdm_private_client*)client;
- if (!name)
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ if (error)
+ *error = TDM_ERROR_PROTOCOL_ERROR;
+ pthread_mutex_unlock(&private_client->lock);
+ return NULL;
+ }
+
+ if (!name) {
name = "primary";
+ } else if (strncmp(name, "primary", 7) && strncmp(name, "default", 7)) {
+ if (error)
+ *error = TDM_ERROR_INVALID_PARAMETER;
+ pthread_mutex_unlock(&private_client->lock);
+ return NULL;
+ }
LIST_FOR_EACH_ENTRY(private_output, &private_client->output_list, link) {
- if (!strncmp(private_output->name, name, TDM_NAME_LEN))
+ if (!strncmp(private_output->name, name, TDM_NAME_LEN)) {
+ pthread_mutex_unlock(&private_client->lock);
return (tdm_client_output*)private_output;
+ }
+ }
+
+ wrapper = wl_proxy_create_wrapper(private_client->tdm);
+ if (!wrapper) {
+ TDM_ERR("create output_wrapper failed");
+ if (error)
+ *error = TDM_ERROR_OUT_OF_MEMORY;
+ pthread_mutex_unlock(&private_client->lock);
+ return NULL;
}
+ wl_proxy_set_queue(wrapper, private_client->queue);
+
private_output = calloc(1, sizeof *private_output);
if (!private_output) {
/* LCOV_EXCL_START */
-
+ wl_proxy_wrapper_destroy(wrapper);
TDM_ERR("alloc failed");
if (error)
*error = TDM_ERROR_OUT_OF_MEMORY;
+ pthread_mutex_unlock(&private_client->lock);
return NULL;
/* LCOV_EXCL_STOP */
private_output->private_client = private_client;
snprintf(private_output->name, TDM_NAME_LEN, "%s", name);
- private_output->output = wl_tdm_create_output(private_client->tdm, private_output->name);
+ private_output->output = wl_tdm_create_output((struct wl_tdm *)wrapper, private_output->name);
+ wl_proxy_wrapper_destroy(wrapper);
if (!private_output->output) {
/* LCOV_EXCL_START */
free(private_output);
if (error)
*error = TDM_ERROR_OUT_OF_MEMORY;
+ pthread_mutex_unlock(&private_client->lock);
return NULL;
/* LCOV_EXCL_STOP */
LIST_INITHEAD(&private_output->vblank_list);
LIST_INITHEAD(&private_output->change_handler_list);
- LIST_ADDTAIL(&private_output->link, &private_client->output_list);
wl_tdm_output_add_listener(private_output->output,
&tdm_client_output_listener, private_output);
- wl_display_roundtrip(private_client->display);
+ wl_display_roundtrip_queue(private_client->display, private_client->queue);
+
+ wl_proxy_set_queue((struct wl_proxy *)private_output->output, NULL);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ wl_tdm_output_destroy(private_output->output);
+ free(private_output);
+ if (error)
+ *error = TDM_ERROR_PROTOCOL_ERROR;
+ pthread_mutex_unlock(&private_client->lock);
+ return NULL;
+ }
+
+ LIST_ADDTAIL(&private_output->link, &private_client->output_list);
+
+ pthread_mutex_unlock(&private_client->lock);
return (tdm_client_output*)private_output;
}
void *user_data)
{
tdm_private_client_output *private_output;
- tdm_client_output_handler_info *h;
+ tdm_private_client *private_client;
+ tdm_client_output_handler_info *h = NULL;
TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
private_output = (tdm_private_client_output*)output;
+ private_client = private_output->private_client;
+
+ LIST_FOR_EACH_ENTRY(h, &private_output->change_handler_list, link) {
+ if (h->func == func && h->user_data == user_data) {
+ TDM_ERR("can't add twice");
+ return TDM_ERROR_BAD_REQUEST;
+ }
+ }
h = calloc(1, sizeof *h);
TDM_RETURN_VAL_IF_FAIL(h != NULL, TDM_ERROR_OUT_OF_MEMORY);
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ free(h);
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
if (LIST_IS_EMPTY(&private_output->change_handler_list)) {
wl_tdm_output_watch_output_changes(private_output->output, 1);
+ wl_display_roundtrip_queue(private_client->display, private_client->queue);
/* TODO: this is very tricky.
* If a client adds the change_handler, we might be able to guess that
h->func = func;
h->user_data = user_data;
LIST_ADDTAIL(&h->link, &private_output->change_handler_list);
+ LIST_INITHEAD(&h->call_link);
- return TDM_ERROR_NOT_IMPLEMENTED;
+ pthread_mutex_unlock(&private_client->lock);
+
+ return TDM_ERROR_NONE;
}
void
void *user_data)
{
tdm_private_client_output *private_output;
+ tdm_private_client *private_client;
tdm_client_output_handler_info *h = NULL;
TDM_RETURN_IF_FAIL(output != NULL);
TDM_RETURN_IF_FAIL(func != NULL);
private_output = (tdm_private_client_output*)output;
+ private_client = private_output->private_client;
+
+ pthread_mutex_lock(&private_client->lock);
LIST_FOR_EACH_ENTRY(h, &private_output->change_handler_list, link) {
if (h->func != func || h->user_data != user_data)
LIST_DEL(&h->link);
free(h);
- if (LIST_IS_EMPTY(&private_output->change_handler_list))
- wl_tdm_output_watch_output_changes(private_output->output, 0);
+ if (LIST_IS_EMPTY(&private_output->change_handler_list)) {
+ private_output->watch_output_changes = 0;
+ if (!CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ wl_tdm_output_watch_output_changes(private_output->output, 0);
+ wl_display_roundtrip_queue(private_client->display, private_client->queue);
+ }
+ }
+
+ pthread_mutex_unlock(&private_client->lock);
return;
}
+
+ pthread_mutex_unlock(&private_client->lock);
}
tdm_error
TDM_RETURN_VAL_IF_FAIL(refresh != NULL, TDM_ERROR_INVALID_PARAMETER);
private_output = (tdm_private_client_output*)output;
+ private_client = private_output->private_client;
+
+ pthread_mutex_lock(&private_client->lock);
if (private_output->watch_output_changes) {
*refresh = private_output->refresh;
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_NONE;
}
- private_client = private_output->private_client;
- TDM_RETURN_VAL_IF_FAIL(private_client != NULL, TDM_ERROR_INVALID_PARAMETER);
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+ wl_proxy_set_queue((struct wl_proxy *)private_output->output, private_client->queue);
wl_tdm_output_get_mode(private_output->output);
- wl_display_roundtrip(private_client->display);
+ wl_display_roundtrip_queue(private_client->display, private_client->queue);
+ wl_proxy_set_queue((struct wl_proxy *)private_output->output, NULL);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
*refresh = private_output->refresh;
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
}
TDM_RETURN_VAL_IF_FAIL(status != NULL, TDM_ERROR_INVALID_PARAMETER);
private_output = (tdm_private_client_output*)output;
+ private_client = private_output->private_client;
+
+ pthread_mutex_lock(&private_client->lock);
if (private_output->watch_output_changes) {
*status = private_output->connection;
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_NONE;
}
- private_client = private_output->private_client;
- TDM_RETURN_VAL_IF_FAIL(private_client != NULL, TDM_ERROR_INVALID_PARAMETER);
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+ wl_proxy_set_queue((struct wl_proxy *)private_output->output, private_client->queue);
wl_tdm_output_get_connection(private_output->output);
- wl_display_roundtrip(private_client->display);
+ wl_display_roundtrip_queue(private_client->display, private_client->queue);
+ wl_proxy_set_queue((struct wl_proxy *)private_output->output, NULL);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
*status = private_output->connection;
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
}
TDM_RETURN_VAL_IF_FAIL(dpms != NULL, TDM_ERROR_INVALID_PARAMETER);
private_output = (tdm_private_client_output*)output;
+ private_client = private_output->private_client;
if (private_output->watch_output_changes) {
*dpms = private_output->dpms;
return TDM_ERROR_NONE;
}
- private_client = private_output->private_client;
- TDM_RETURN_VAL_IF_FAIL(private_client != NULL, TDM_ERROR_INVALID_PARAMETER);
+ pthread_mutex_lock(&private_client->lock);
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ wl_proxy_set_queue((struct wl_proxy *)private_output->output, private_client->queue);
wl_tdm_output_get_dpms(private_output->output);
- wl_display_roundtrip(private_client->display);
+ wl_display_roundtrip_queue(private_client->display, private_client->queue);
+ wl_proxy_set_queue((struct wl_proxy *)private_output->output, NULL);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
*dpms = private_output->dpms;
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
}
tdm_private_client *private_client;
tdm_private_client_output *private_output;
tdm_private_client_vblank *private_vblank;
+ struct wl_proxy *wrapper;
if (error)
*error = TDM_ERROR_NONE;
private_output = (tdm_private_client_output*)output;
private_client = private_output->private_client;
- if (!private_client) {
- TDM_ERR("'!private_client' failed");
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
if (error)
- *error = TDM_ERROR_INVALID_PARAMETER;
+ *error = TDM_ERROR_PROTOCOL_ERROR;
+ pthread_mutex_unlock(&private_client->lock);
+ return NULL;
+ }
+
+ wrapper = wl_proxy_create_wrapper(private_output->output);
+ if (!wrapper) {
+ TDM_ERR("create output_wrapper failed");
+ if (error)
+ *error = TDM_ERROR_OUT_OF_MEMORY;
+ pthread_mutex_unlock(&private_client->lock);
return NULL;
}
+ wl_proxy_set_queue(wrapper, private_client->queue);
+
private_vblank = calloc(1, sizeof *private_vblank);
if (!private_vblank) {
/* LCOV_EXCL_START */
TDM_ERR("alloc failed");
+ wl_proxy_wrapper_destroy(wrapper);
if (error)
*error = TDM_ERROR_OUT_OF_MEMORY;
+ pthread_mutex_unlock(&private_client->lock);
return NULL;
/* LCOV_EXCL_STOP */
private_vblank->private_output = private_output;
- private_vblank->vblank = wl_tdm_output_create_vblank(private_output->output);
+ private_vblank->vblank = wl_tdm_output_create_vblank((struct wl_tdm_output*)wrapper);
+ wl_proxy_wrapper_destroy(wrapper);
if (!private_vblank->vblank) {
/* LCOV_EXCL_START */
free(private_vblank);
if (error)
*error = TDM_ERROR_OUT_OF_MEMORY;
+ pthread_mutex_unlock(&private_client->lock);
return NULL;
/* LCOV_EXCL_STOP */
private_vblank->enable_fake = 0;
LIST_INITHEAD(&private_vblank->wait_list);
- LIST_ADDTAIL(&private_vblank->link, &private_output->vblank_list);
wl_tdm_vblank_add_listener(private_vblank->vblank,
&tdm_client_vblank_listener, private_vblank);
- wl_display_roundtrip(private_client->display);
+ wl_display_roundtrip_queue(private_client->display, private_client->queue);
+
+ wl_proxy_set_queue((struct wl_proxy *)private_vblank->vblank, NULL);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ wl_tdm_vblank_destroy(private_vblank->vblank);
+ free(private_vblank);
+ if (error)
+ *error = TDM_ERROR_PROTOCOL_ERROR;
+ pthread_mutex_unlock(&private_client->lock);
+ return NULL;
+ }
+
+ LIST_ADDTAIL(&private_vblank->link, &private_output->vblank_list);
+
+ pthread_mutex_unlock(&private_client->lock);
return (tdm_client_vblank*)private_vblank;
}
tdm_client_vblank_destroy(tdm_client_vblank *vblank)
{
tdm_private_client_vblank *private_vblank;
+ tdm_private_client *private_client;
tdm_client_wait_info *w = NULL, *ww = NULL;
TDM_RETURN_IF_FAIL(vblank != NULL);
private_vblank = vblank;
+ private_client = private_vblank->private_output->private_client;
+
+ pthread_mutex_lock(&private_client->lock);
+
LIST_DEL(&private_vblank->link);
LIST_FOR_EACH_ENTRY_SAFE(w, ww, &private_vblank->wait_list, link) {
wl_tdm_vblank_destroy(private_vblank->vblank);
free(private_vblank);
+
+ pthread_mutex_unlock(&private_client->lock);
}
tdm_error
tdm_client_vblank_set_name(tdm_client_vblank *vblank, const char *name)
{
tdm_private_client_vblank *private_vblank;
+ tdm_private_client *private_client;
TDM_RETURN_VAL_IF_FAIL(vblank != NULL, TDM_ERROR_INVALID_PARAMETER);
private_vblank = vblank;
+ private_client = private_vblank->private_output->private_client;
+
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
if (!name)
name = TDM_VBLANK_DEFAULT_NAME;
wl_tdm_vblank_set_name(private_vblank->vblank, private_vblank->name);
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
}
tdm_client_vblank_set_sync(tdm_client_vblank *vblank, unsigned int sync)
{
tdm_private_client_vblank *private_vblank;
+ tdm_private_client *private_client;
TDM_RETURN_VAL_IF_FAIL(vblank != NULL, TDM_ERROR_INVALID_PARAMETER);
private_vblank = vblank;
+ private_client = private_vblank->private_output->private_client;
+
+ pthread_mutex_lock(&private_client->lock);
private_vblank->sync = sync;
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_NONE;
}
tdm_client_vblank_set_fps(tdm_client_vblank *vblank, unsigned int fps)
{
tdm_private_client_vblank *private_vblank;
+ tdm_private_client *private_client;
TDM_RETURN_VAL_IF_FAIL(vblank != NULL, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(fps > 0, TDM_ERROR_INVALID_PARAMETER);
private_vblank = vblank;
+ private_client = private_vblank->private_output->private_client;
- if (private_vblank->fps == fps)
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ if (private_vblank->fps == fps) {
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_NONE;
+ }
+
private_vblank->fps = fps;
wl_tdm_vblank_set_fps(private_vblank->vblank, fps);
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
}
tdm_client_vblank_set_offset(tdm_client_vblank *vblank, int offset_ms)
{
tdm_private_client_vblank *private_vblank;
+ tdm_private_client *private_client;
TDM_RETURN_VAL_IF_FAIL(vblank != NULL, TDM_ERROR_INVALID_PARAMETER);
private_vblank = vblank;
TDM_RETURN_VAL_IF_FAIL(private_vblank->started == 0, TDM_ERROR_BAD_REQUEST);
- if (private_vblank->offset == offset_ms)
+ private_client = private_vblank->private_output->private_client;
+
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ if (private_vblank->offset == offset_ms) {
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_NONE;
+ }
+
private_vblank->offset = offset_ms;
wl_tdm_vblank_set_offset(private_vblank->vblank, offset_ms);
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
}
tdm_client_vblank_set_enable_fake(tdm_client_vblank *vblank, unsigned int enable_fake)
{
tdm_private_client_vblank *private_vblank;
+ tdm_private_client *private_client;
TDM_RETURN_VAL_IF_FAIL(vblank != NULL, TDM_ERROR_INVALID_PARAMETER);
private_vblank = vblank;
+ private_client = private_vblank->private_output->private_client;
- if (private_vblank->enable_fake == enable_fake)
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ if (private_vblank->enable_fake == enable_fake) {
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_NONE;
+ }
+
private_vblank->enable_fake = enable_fake;
wl_tdm_vblank_set_enable_fake(private_vblank->vblank, enable_fake);
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
}
private_output = private_vblank->private_output;
private_client = private_output->private_client;
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
if (!private_vblank->started)
private_vblank->started = 1;
- if (private_output->watch_output_changes && !private_vblank->enable_fake) {
+ if (!private_vblank->enable_fake) {
if (private_output->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
TDM_ERR("output disconnected");
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_OUTPUT_DISCONNECTED;
}
if (TDM_OUTPUT_DPMS_VSYNC_IS_OFF(private_output->dpms)) {
TDM_ERR("dpms %s", tdm_dpms_str(private_output->dpms));
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_DPMS_OFF;
}
}
/* LCOV_EXCL_START */
TDM_ERR("alloc failed");
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_OUT_OF_MEMORY;
/* LCOV_EXCL_STOP */
w->user_data = user_data;
LIST_ADDTAIL(&w->link, &private_vblank->wait_list);
+ LIST_INITHEAD(&w->call_link);
clock_gettime(CLOCK_MONOTONIC, &tp);
req_sec = (unsigned int)tp.tv_sec;
if (!private_vblank->sync) {
wl_display_flush(private_client->display);
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_NONE;
}
LIST_DEL(&w->link);
free(w);
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
/* LCOV_EXCL_STOP */
private_output = private_vblank->private_output;
private_client = private_output->private_client;
+ pthread_mutex_lock(&private_client->lock);
+
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
if (!private_vblank->started)
private_vblank->started = 1;
- if (private_output->watch_output_changes && !private_vblank->enable_fake) {
+ if (!private_vblank->enable_fake) {
if (private_output->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
TDM_ERR("output disconnected");
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_OUTPUT_DISCONNECTED;
}
if (TDM_OUTPUT_DPMS_VSYNC_IS_OFF(private_output->dpms)) {
TDM_ERR("dpms %s", tdm_dpms_str(private_output->dpms));
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_DPMS_OFF;
}
}
/* LCOV_EXCL_START */
TDM_ERR("alloc failed");
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_OUT_OF_MEMORY;
/* LCOV_EXCL_STOP */
w->user_data = user_data;
LIST_ADDTAIL(&w->link, &private_vblank->wait_list);
+ LIST_INITHEAD(&w->call_link);
clock_gettime(CLOCK_MONOTONIC, &tp);
req_sec = (unsigned int)tp.tv_sec;
if (!private_vblank->sync) {
wl_display_flush(private_client->display);
+ pthread_mutex_unlock(&private_client->lock);
return TDM_ERROR_NONE;
}
LIST_DEL(&w->link);
free(w);
+ if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+ pthread_mutex_unlock(&private_client->lock);
+ return TDM_ERROR_PROTOCOL_ERROR;
+ }
+
+ pthread_mutex_unlock(&private_client->lock);
+
return TDM_ERROR_NONE;
/* LCOV_EXCL_STOP */
}
+
+unsigned int
+tdm_client_vblank_is_waiting(tdm_client_vblank *vblank)
+{
+ tdm_private_client_vblank *private_vblank;
+
+ TDM_RETURN_VAL_IF_FAIL(vblank != NULL, 0);
+
+ private_vblank = vblank;
+
+ return (LIST_LENGTH(&private_vblank->wait_list) > 0) ? 1 : 0;
+}
projects / platform / core / uifw / libtdm.git / blobdiff