Backed out changeset f60ec9e34d4d (bug 1290625) for causing merge conflict with m-c
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Sat, 30 Jul 2016 16:49:02 +0200
changeset 347486 2ba03ba34ece7fdcd007056de6ee58b758333e54
parent 347485 a4d524f408817b7fe58258084902f41691548852
child 347487 9e48f74f44c387f4601ba0aab3d651703183848f
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1290625
milestone50.0a1
backs outf60ec9e34d4d34958ff64d573862474dac8c0a6f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset f60ec9e34d4d (bug 1290625) for causing merge conflict with m-c
media/libcubeb/src/cubeb_utils_unix.h
deleted file mode 100644
--- a/media/libcubeb/src/cubeb_utils_unix.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright © 2016 Mozilla Foundation
- *
- * This program is made available under an ISC-style license.  See the
- * accompanying file LICENSE for details.
- */
-
-#if !defined(CUBEB_UTILS_UNIX)
-#define CUBEB_UTILS_UNIX
-
-#include <pthread.h>
-#include <errno.h>
-#include <stdio.h>
-
-/* This wraps a critical section to track the owner in debug mode. */
-class owned_critical_section
-{
-public:
-  owned_critical_section()
-  {
-    pthread_mutexattr_t attr;
-    pthread_mutexattr_init(&attr);
-    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-
-#ifdef DEBUG
-    int r =
-#endif
-    pthread_mutex_init(&mutex, &attr);
-#ifdef DEBUG
-    assert(r == 0);
-#endif
-
-    pthread_mutexattr_destroy(&attr);
-  }
-
-  ~owned_critical_section()
-  {
-#ifdef DEBUG
-    int r =
-#endif
-    pthread_mutex_destroy(&mutex);
-#ifdef DEBUG
-    assert(r == 0);
-#endif
-  }
-
-  void enter()
-  {
-#ifdef DEBUG
-    int r =
-#endif
-    pthread_mutex_lock(&mutex);
-#ifdef DEBUG
-    assert(r == 0 && "Deadlock");
-#endif
-  }
-
-  void leave()
-  {
-#ifdef DEBUG
-    int r =
-#endif
-    pthread_mutex_unlock(&mutex);
-#ifdef DEBUG
-    assert(r == 0 && "Unlocking unlocked mutex");
-#endif
-  }
-
-  void assert_current_thread_owns()
-  {
-#ifdef DEBUG
-    int r = pthread_mutex_lock(&mutex);
-    assert(r == EDEADLK);
-#endif
-  }
-
-private:
-  pthread_mutex_t mutex;
-};
-
-#endif /* CUBEB_UTILS_UNIX */