rework histogram_bezier, init wm icon set_icon(gg), update de.po+msg/txt

[goodguy/history.git] / cinelerra-5.1 / guicast / mutex.h

diff --git a/cinelerra-5.1/guicast/mutex.h b/cinelerra-5.1/guicast/mutex.h
index f510f0ddc9ef43eb445db5596c44a2d8798a7fc3..4a1052cdaf68221777bf54f99c61c622287a1e69 100644 (file)
--- a/cinelerra-5.1/guicast/mutex.h
+++ b/cinelerra-5.1/guicast/mutex.h
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #ifndef MUTEX_H
@@ -24,8 +24,9 @@
 
 #include <pthread.h>
 #include <stdio.h>
+#include "bctrace.inc"
 
-class Mutex
+class Mutex : public trace_info
 {
 public:
        Mutex(const char *title = 0, int recursive = 0);
@@ -52,14 +53,40 @@ public:
        const char *title;
 };
 
-class mLock
-{
-       Mutex &mutex;
+#if 0
+#include <stdio.h>
+
+class TMutex : public Mutex
+{ // logged
 public:
-       mLock(Mutex &m) : mutex(m) { mutex.lock(); }
-       mLock(Mutex *m) : mutex(*m) { mutex.lock(); }
-       ~mLock() { mutex.unlock(); }
+       TMutex(const char *title = 0, int recursive = 0)
+         : Mutex(title, recursive) {
+               printf("new TMutex(%s) = %p\n", title, this);
+       }
+       ~TMutex() {
+               printf("del TMutex(%s) = %p\n", title, this);
+       }
+       int lock(const char *location = 0) {
+               printf("locking %p: %s\n", this, title);  int ret = Mutex::lock(location);
+               printf("locked %p:%d %s\n", this, ret,  title);  return ret;
+       }
+       int unlock() {
+               printf("unlocking %p: %s\n", this, title);  return Mutex::unlock();
+       }
+       int trylock(const char *location = 0) {
+               printf("try locking %p: %s\n", this, title);  int ret = Mutex::trylock(location);
+               printf("try locked %p:%d %s\n", this, ret, title);  return ret;
+       }
+       int reset() {
+               printf("reset %p: %s\n", this, title);
+               return Mutex::reset();
+       }
+       int is_locked() {
+               int ret = Mutex::is_locked();
+               printf("is_locked %p:%d %s\n", this, ret, title);
+               return ret;
+       }
 };
 
-
+#endif
 #endif