Merge branch 'maint'

1 files changed, 46 insertions, 0 deletions

diff --git a/erts/emulator/beam/erl_lock_flags.c b/erts/emulator/beam/erl_lock_flags.c
new file mode 100644
index 0000000000..ba6a7217f2
--- /dev/null
+++ b/erts/emulator/beam/erl_lock_flags.c
@@ -0,0 +1,46 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2017. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "erl_lock_flags.h"
+
+const char *erts_lock_flags_get_type_name(erts_lock_flags_t flags) {
+    switch(flags & ERTS_LOCK_FLAGS_MASK_TYPE) {
+        case ERTS_LOCK_FLAGS_TYPE_PROCLOCK:
+            return "proclock";
+        case ERTS_LOCK_FLAGS_TYPE_MUTEX:
+            if(flags & ERTS_LOCK_FLAGS_PROPERTY_READ_WRITE) {
+                return "rw_mutex";
+            }
+
+            return "mutex";
+        case ERTS_LOCK_FLAGS_TYPE_SPINLOCK:
+            if(flags & ERTS_LOCK_FLAGS_PROPERTY_READ_WRITE) {
+                return "rw_spinlock";
+            }
+
+            return "spinlock";
+        default:
+            return "garbage";
+    }
+}