Changeset 122150 in webkit

Timestamp:

Jul 9, 2012 12:59:02 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Log significant Gamepad API-related events
​https://bugs.webkit.org/show_bug.cgi?id=90595

Patch by Christophe Dumez <Christophe Dumez> on 2012-07-09
Reviewed by Antonio Gomes.

Log significant Gamepad API-related events in
GamepadsEfl.

No new tests, no behavior change.

• platform/efl/GamepadsEfl.cpp:

(WebCore::GamepadDeviceEfl::deviceFile):
(GamepadDeviceEfl):
(WebCore::GamepadDeviceEfl::GamepadDeviceEfl):
(WebCore::GamepadDeviceEfl::readCallback):
(WebCore::GamepadsEfl::registerDevice):
(WebCore::GamepadsEfl::unregisterDevice):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/efl/GamepadsEfl.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-09  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] Log significant Gamepad API-related events
+        https://bugs.webkit.org/show_bug.cgi?id=90595
+
+        Reviewed by Antonio Gomes.
+
+        Log significant Gamepad API-related events in
+        GamepadsEfl.
+
+        No new tests, no behavior change.
+
+        * platform/efl/GamepadsEfl.cpp:
+        (WebCore::GamepadDeviceEfl::deviceFile):
+        (GamepadDeviceEfl):
+        (WebCore::GamepadDeviceEfl::GamepadDeviceEfl):
+        (WebCore::GamepadDeviceEfl::readCallback):
+        (WebCore::GamepadsEfl::registerDevice):
+        (WebCore::GamepadsEfl::unregisterDevice):
+
 2012-07-09  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/efl/GamepadsEfl.cpp

@@ -31 +31 @@
 #include "GamepadDeviceLinux.h"
 #include "GamepadList.h"
+#include "Logging.h"
 #include <Ecore.h>
 #include <Eeze.h>
@@ -52 +53 @@
     ~GamepadDeviceEfl();
     void resetFdHandler() { m_fdHandler = 0; }
+    const String& deviceFile() const { return m_deviceFile; }
 
 private:
@@ -58 +60 @@
 
     Ecore_Fd_Handler* m_fdHandler;
+    String m_deviceFile;
 };
 
@@ -63 +66 @@
     : GamepadDeviceLinux(deviceFile)
     , m_fdHandler(0)
+    , m_deviceFile(deviceFile)
 {
     if (m_fileDescriptor < 0)
@@ -83 +87 @@
 
     if (ecore_main_fd_handler_active_get(fdHandler, ECORE_FD_ERROR)) {
-        LOG_ERROR("An error occurred while watching the joystick file descriptor, aborting.");
+        LOG_ERROR("An error occurred while watching the joystick file descriptor at %s, aborting.", gamepadDevice->deviceFile().utf8().data());
         gamepadDevice->resetFdHandler();
         return ECORE_CALLBACK_CANCEL;
@@ -93 +97 @@
 
     if (len <= 0) {
-        LOG_ERROR("Failed to read joystick file descriptor, aborting.");
+        LOG_ERROR("Failed to read joystick file descriptor at %s, aborting.", gamepadDevice->deviceFile().utf8().data());
         gamepadDevice->resetFdHandler();
         return ECORE_CALLBACK_CANCEL;
     }
     if (len != sizeof(event)) {
-        LOG_ERROR("Wrong js_event size read on file descriptor, ignoring.");
+        LOG_ERROR("Wrong js_event size read on file descriptor at %s, ignoring.", gamepadDevice->deviceFile().utf8().data());
         return ECORE_CALLBACK_RENEW;
     }
@@ -180 +184 @@
         return;
 
+    LOG(Gamepad, "Registering gamepad at %s", deviceFile);
+
     const size_t slotCount = m_slots.size();
     for (size_t index = 0; index < slotCount; ++index) {
         if (!m_slots[index]) {
             m_slots[index] = GamepadDeviceEfl::create(String::fromUTF8(deviceFile));
+            LOG(Gamepad, "Gamepad device name is %s", m_slots[index]->id().utf8().data());
             m_deviceMap.add(syspath, m_slots[index].get());
             break;
@@ -196 +203 @@
 
     GamepadDeviceEfl* gamepadDevice = m_deviceMap.take(syspath);
+    LOG(Gamepad, "Unregistering gamepad at %s", gamepadDevice->deviceFile().utf8().data());
     const size_t index = m_slots.find(gamepadDevice);
     ASSERT(index != notFound);