X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbctrace.h;h=e92c09760ff74c497e20daefb0c1dab95169a502;hb=4fedf98530b3a6ff1ada6d2b9fbbc470e3df300c;hp=5cbf0f53b494b88f0aff749d116ed93c154236ea;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bctrace.h b/cinelerra-5.1/guicast/bctrace.h index 5cbf0f53..e92c0976 100644 --- a/cinelerra-5.1/guicast/bctrace.h +++ b/cinelerra-5.1/guicast/bctrace.h @@ -131,7 +131,7 @@ public: this->loc = loc; this->is_owner = 0; this->id = table_id++; this->tid = pthread_self(); } - void clear() { + void clear() { this->info = 0; this->title = 0; this->loc = 0; this->is_owner = 0; this->id = -1; this->tid = 0; } @@ -179,19 +179,24 @@ public: void lock() { pthread_mutex_lock(&the_lock); } void unlock() { pthread_mutex_unlock(&the_lock); } - TheLock() { + void init() { pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); pthread_mutex_init(&the_lock, &attr); } - ~TheLock() { + void finit() { pthread_mutex_destroy(&the_lock); } + void reset() { finit(); init(); } + + TheLock() { init(); } + ~TheLock() { finit(); } }; class TheLocker { public: static TheLock the_lock; + static void reset() { the_lock.reset(); } TheLocker() { the_lock.lock(); } ~TheLocker() { the_lock.unlock(); } @@ -211,12 +216,9 @@ public: static void dump_threads(FILE *fp); static void dbg_add(pthread_t tid, pthread_t owner, const char *nm); static void dbg_del(pthread_t tid); - + static void reset() { the_list.remove_all_objects(); TheLocker::reset(); } TheList() {} - ~TheList() { - TheLocker the_locker; - remove_all_objects(); - } + ~TheList() { reset(); } }; class TheChk {