Changeset 37556 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 13, 2008, 4:44:35 AM (17 years ago)

Author:

[email protected]

Message:

2008-10-13 Marco Barisione <​[email protected]>

Reviewed by Darin Adler. Landed by Jan Alonzo.

WebKit GTK Port needs a smartpointer to handle g_free (GFreePtr?)
​http://bugs.webkit.org/show_bug.cgi?id=20483

Start the conversion to use GOwnPtr and fix a memory leak.

• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: (WebCore::mediaPlayerPrivateErrorCallback):

2008-10-13 Marco Barisione <​[email protected]>

Reviewed by Darin Adler. Landed by Jan Alonzo.

WebKit GTK Port needs a smartpointer to handle g_free (GFreePtr?)
​http://bugs.webkit.org/show_bug.cgi?id=20483

Add a GOwnPtr smart pointer (similar to OwnPtr) to handle memory
allocated by GLib and start the conversion to use it.

• GNUmakefile.am:
• wtf/GOwnPtr.cpp: Added. (WTF::GError): (WTF::GList): (WTF::GCond): (WTF::GMutex): (WTF::GPatternSpec): (WTF::GDir):
• wtf/GOwnPtr.h: Added. (WTF::freeOwnedPtr): (WTF::GOwnPtr::GOwnPtr): (WTF::GOwnPtr::~GOwnPtr): (WTF::GOwnPtr::get): (WTF::GOwnPtr::release): (WTF::GOwnPtr::rawPtr): (WTF::GOwnPtr::set): (WTF::GOwnPtr::clear): (WTF::GOwnPtr::operator*): (WTF::GOwnPtr::operator->): (WTF::GOwnPtr::operator!): (WTF::GOwnPtr::operator UnspecifiedBoolType): (WTF::GOwnPtr::swap): (WTF::swap): (WTF::operator==): (WTF::operator!=): (WTF::getPtr):
• wtf/Threading.h:
• wtf/ThreadingGtk.cpp: (WTF::Mutex::~Mutex): (WTF::Mutex::lock): (WTF::Mutex::tryLock): (WTF::Mutex::unlock): (WTF::ThreadCondition::~ThreadCondition): (WTF::ThreadCondition::wait): (WTF::ThreadCondition::timedWait): (WTF::ThreadCondition::signal): (WTF::ThreadCondition::broadcast):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• wtf/GOwnPtr.cpp (added)
• wtf/GOwnPtr.h (added)
• wtf/Threading.h (modified) (2 diffs)
• wtf/ThreadingGtk.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-13  Marco Barisione  <[email protected]>
+
+        Reviewed by Darin Adler. Landed by Jan Alonzo.
+
+        WebKit GTK Port needs a smartpointer to handle g_free (GFreePtr?)
+        http://bugs.webkit.org/show_bug.cgi?id=20483
+
+        Add a GOwnPtr smart pointer (similar to OwnPtr) to handle memory
+        allocated by GLib and start the conversion to use it.
+
+        * GNUmakefile.am:
+        * wtf/GOwnPtr.cpp: Added.
+        (WTF::GError):
+        (WTF::GList):
+        (WTF::GCond):
+        (WTF::GMutex):
+        (WTF::GPatternSpec):
+        (WTF::GDir):
+        * wtf/GOwnPtr.h: Added.
+        (WTF::freeOwnedPtr):
+        (WTF::GOwnPtr::GOwnPtr):
+        (WTF::GOwnPtr::~GOwnPtr):
+        (WTF::GOwnPtr::get):
+        (WTF::GOwnPtr::release):
+        (WTF::GOwnPtr::rawPtr):
+        (WTF::GOwnPtr::set):
+        (WTF::GOwnPtr::clear):
+        (WTF::GOwnPtr::operator*):
+        (WTF::GOwnPtr::operator->):
+        (WTF::GOwnPtr::operator!):
+        (WTF::GOwnPtr::operator UnspecifiedBoolType):
+        (WTF::GOwnPtr::swap):
+        (WTF::swap):
+        (WTF::operator==):
+        (WTF::operator!=):
+        (WTF::getPtr):
+        * wtf/Threading.h:
+        * wtf/ThreadingGtk.cpp:
+        (WTF::Mutex::~Mutex):
+        (WTF::Mutex::lock):
+        (WTF::Mutex::tryLock):
+        (WTF::Mutex::unlock):
+        (WTF::ThreadCondition::~ThreadCondition):
+        (WTF::ThreadCondition::wait):
+        (WTF::ThreadCondition::timedWait):
+        (WTF::ThreadCondition::signal):
+        (WTF::ThreadCondition::broadcast):
+
 2008-10-12  Gabriella Toth  <[email protected]>
 

trunk/JavaScriptCore/GNUmakefile.am

@@ -241 +241 @@
         JavaScriptCore/wtf/Forward.h \
         JavaScriptCore/wtf/GetPtr.h \
+        JavaScriptCore/wtf/GOwnPtr.cpp \
+        JavaScriptCore/wtf/GOwnPtr.h \
         JavaScriptCore/wtf/HashCountedSet.h \
         JavaScriptCore/wtf/HashFunctions.h \

trunk/JavaScriptCore/wtf/Threading.h

@@ -63 +63 @@
 #include <wtf/Locker.h>
 #include <wtf/Noncopyable.h>
+#if PLATFORM(GTK)
+#include <wtf/GOwnPtr.h>
+#endif
 
 #if PLATFORM(WIN_OS)
@@ -118 +121 @@
 typedef pthread_cond_t PlatformCondition;
 #elif PLATFORM(GTK)
-typedef GMutex* PlatformMutex;
-typedef GCond* PlatformCondition;
+typedef GOwnPtr<GMutex> PlatformMutex;
+typedef GOwnPtr<GCond> PlatformCondition;
 #elif PLATFORM(QT)
 typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex;

trunk/JavaScriptCore/wtf/ThreadingGtk.cpp

@@ -158 +158 @@
 Mutex::~Mutex()
 {
-    g_mutex_free(m_mutex);
 }
 
 void Mutex::lock()
 {
-    g_mutex_lock(m_mutex);
+    g_mutex_lock(m_mutex.get());
 }
 
 bool Mutex::tryLock()
 {
-    return g_mutex_trylock(m_mutex);
+    return g_mutex_trylock(m_mutex.get());
 }
 
 void Mutex::unlock()
 {
-    g_mutex_unlock(m_mutex);
+    g_mutex_unlock(m_mutex.get());
 }
 
@@ -183 +182 @@
 ThreadCondition::~ThreadCondition()
 {
-    g_cond_free(m_condition);
 }
 
 void ThreadCondition::wait(Mutex& mutex)
 {
-    g_cond_wait(m_condition, mutex.impl());
+    g_cond_wait(m_condition.get(), mutex.impl().get());
 }
 
@@ -211 +209 @@
     }
 
-    return g_cond_timed_wait(m_condition, mutex.impl(), &targetTime);
+    return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime);
 }
 
 void ThreadCondition::signal()
 {
-    g_cond_signal(m_condition);
+    g_cond_signal(m_condition.get());
 }
 
 void ThreadCondition::broadcast()
 {
-    g_cond_broadcast(m_condition);
-}
-
-
-}
+    g_cond_broadcast(m_condition.get());
+}
+
+
+}