From 96ef32077a5e7a25c118c86b9df9fd9a49aac467 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Tue, 11 Jun 2013 21:52:53 +0900 Subject: [PATCH] remove unnecessary log Change-Id: I514cb92259a542a83521a1a2986fd5af04358264 --- common/xdbg_dbus_server.c | 8 +++---- module/xdbg_module_evlog.c | 55 +++------------------------------------------- 2 files changed, 7 insertions(+), 56 deletions(-) diff --git a/common/xdbg_dbus_server.c b/common/xdbg_dbus_server.c index e8ac325..ab2645f 100644 --- a/common/xdbg_dbus_server.c +++ b/common/xdbg_dbus_server.c @@ -92,7 +92,7 @@ _xDbgDBusServerReplyMessage (XDbgDBusServerInfo *info, DBusMessage *msg, char *r return FALSE; } - XDBG_INFO (MDBUS, "[SERVER] send reply\n"); + XDBG_DEBUG (MDBUS, "[SERVER] send reply\n"); dbus_connection_flush (info->conn); dbus_message_unref (reply_msg); @@ -114,7 +114,7 @@ _xDbgDBusServerProcessMessage (XDbgDBusServerInfo *info, DBusMessage *msg) dbus_error_init (&err); - XDBG_INFO (MDBUS, "[SERVER] Process a message (%s.%s)\n", + XDBG_DEBUG (MDBUS, "[SERVER] Process a message (%s.%s)\n", dbus_message_get_interface (msg), dbus_message_get_member (msg)); XDBG_RETURN_IF_FAIL (info->conn != NULL); @@ -221,7 +221,7 @@ _xDbgDBusServerMsgHandler (DBusConnection *connection, DBusMessage *msg, void *d if (!info || !info->conn || !msg) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - XDBG_INFO (MDBUS, "[SERVER] Got a message (%s.%s)\n", + XDBG_DEBUG (MDBUS, "[SERVER] Got a message (%s.%s)\n", dbus_message_get_interface (msg), dbus_message_get_member (msg)); if (!dbus_message_is_method_call (msg, XDBG_DBUS_INTERFACE, XDBG_DBUS_METHOD)) @@ -242,7 +242,7 @@ _xDbgDBusServerMsgFilter (DBusConnection *conn, DBusMessage *msg, void *data) if (dbus_message_is_signal (msg, DBUS_INTERFACE_LOCAL, "Disconnected")) { - XDBG_INFO (MDBUS, "[SERVER] disconnected by signal\n"); + XDBG_DEBUG (MDBUS, "[SERVER] disconnected by signal\n"); _xDbgDBusServerDeinit (info); if (info->timer) diff --git a/module/xdbg_module_evlog.c b/module/xdbg_module_evlog.c index 0618076..2ec77b4 100644 --- a/module/xdbg_module_evlog.c +++ b/module/xdbg_module_evlog.c @@ -56,7 +56,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include #include #include @@ -559,59 +558,13 @@ _traceACoreEvents (CallbackListPtr *pcbl, pointer unused, pointer calldata) static void _traceAExtEvents (CallbackListPtr *pcbl, pointer unused, pointer calldata) { + if (xev_trace_on == FALSE) + return; + XaceExtAccessRec *rec = calldata; - ClientPtr client; XDBG_RETURN_IF_FAIL (rec != NULL); - client = rec->client; - REQUEST (xReq); - - if (stuff && stuff->reqType >= EXTENSION_BASE) - { - ExtensionEntry *xext = CheckExtension (XvName); - if (xext && stuff->reqType == xext->base) - { - ModuleClientInfo *info = GetClientInfo (client); - XDBG_RETURN_IF_FAIL (info != NULL); - - switch (stuff->data) - { - case xv_GrabPort: - { - xvGrabPortReq *req = (xvGrabPortReq *)client->requestBuffer; - XDBG_INFO (MXDBG, "%s(port:%d), %s(%d)\n", - LookupRequestName (stuff->reqType, stuff->data), req->port, - info->command, info->pid); - break; - } - case xv_UngrabPort: - { - xvUngrabPortReq *req = (xvUngrabPortReq *)client->requestBuffer; - XDBG_INFO (MXDBG, "%s(port:%d), %s(%d)\n", - LookupRequestName (stuff->reqType, stuff->data), req->port, - info->command, info->pid); - break; - } - case xv_StopVideo: - { - xvStopVideoReq *req = (xvStopVideoReq *)client->requestBuffer; - XDBG_INFO (MXDBG, "%s(port:%d,drawable:0x%lx), %s(%d)\n", - LookupRequestName (stuff->reqType, stuff->data), - req->port, req->drawable, - info->command, info->pid); - break; - } - default: - break; - - } - } - } - - if (xev_trace_on == FALSE) - return; - evtPrint (REQUEST, rec->client, NULL, NULL); } @@ -685,7 +638,6 @@ xDbgModuleEvlogInstallHooks (XDbgModule *pMod) ret &= AddCallback (&EventCallback, _traceEvent, NULL); ret &= XaceRegisterCallback (XACE_PROPERTY_ACCESS, _traceProperty, NULL); ret &= XaceRegisterCallback (XACE_RESOURCE_ACCESS, _traceResource, NULL); - ret &= XaceRegisterCallback (XACE_EXT_DISPATCH, _traceAExtEvents, NULL); /*Disable Visibility Event*/ ret &= XaceRegisterCallback (XACE_RECEIVE_ACCESS, _traceReceive, NULL); @@ -713,7 +665,6 @@ xDbgModuleEvlogUninstallHooks (XDbgModule *pMod) DeleteCallback (&EventCallback, _traceEvent, NULL); XaceDeleteCallback (XACE_PROPERTY_ACCESS, _traceProperty, NULL); XaceDeleteCallback (XACE_RESOURCE_ACCESS, _traceResource, NULL); - XaceDeleteCallback (XACE_EXT_DISPATCH, _traceAExtEvents, NULL); } void -- 2.7.4