port: delete useless mutex.h and mutex_* wrappers

Only MUTEX_HELD() is used more than once and even that is only used with
locks that are otherwise used only with the POSIX pthreads API.

Simplify things, drop mutex.h and all its uses, and move to using pthreads
locks everywhere (rather than only almost everywhere).  Move MUTEX_HELD into
port.h where it belongs.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Reviewed-by: Kris Van Hees <kris.van.hees@oracle.com>

include/port.h

@@ -1,6 +1,6 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -9,7 +9,6 @@
 #define _PORT_H
 
 #include <pthread.h>
-#include <mutex.h>
 #include <unistd.h>
 #include <sys/compiler.h>
 #include <sys/types.h>
@@ -26,7 +25,7 @@ hrtime_t gethrtime(void);
 
 int p_online(int cpun);
 
-int mutex_init(mutex_t *m, int flags1, void *ptr);
+#define MUTEX_HELD(x)	((x)->__data.__count == 0)
 
 int daemonize(int close_fds);
 

libdtrace/dt_pid.c

@@ -17,7 +17,6 @@
 #include <sys/ioctl.h>
 #include <sys/sysmacros.h>
 
-#include <mutex.h>
 #include <port.h>
 #include <uprobes.h>
 

libdtrace/dt_proc.c

@@ -1,6 +1,6 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -82,8 +82,6 @@
 #include <poll.h>
 #include <setjmp.h>
 
-#include <mutex.h>
-
 #include <libproc.h>
 #include <dt_proc.h>
 #include <dt_pid.h>

libport/time.c

@@ -1,6 +1,6 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -9,7 +9,6 @@
 #include <sys/dtrace_types.h>
 #include <time.h>
 #include <pthread.h>
-#include <mutex.h>
 
 hrtime_t
 gethrtime(void)
@@ -28,10 +27,3 @@ gethrtime(void)
 
         return v;
 }
-
-int
-mutex_init(mutex_t *m, int flags1, void *ptr)
-{
-	return pthread_mutex_init(m, NULL);
-}
-

libproc/Pcontrol.c

@@ -31,7 +31,6 @@
 
 #include <dt_debug.h>
 
-#include <mutex.h>
 #include <platform.h>
 #include <port.h>
 

libproc/Psymtab.c

@@ -26,7 +26,7 @@
 #include <port.h>
 #include <setjmp.h>
 
-#include <mutex.h>
+#include <pthread.h>
 
 #include <rtld_db.h>
 
@@ -976,7 +976,7 @@ Pmap_mapfile_name(struct ps_prochandle *P, const prmap_t *mapp)
 /*
  * We wouldn't need these if qsort(3C) took an argument for the callback...
  */
-static mutex_t sort_mtx = DEFAULTMUTEX;
+static pthread_mutex_t sort_mtx = PTHREAD_MUTEX_INITIALIZER;
 static char *sort_strs;
 static GElf_Sym *sort_syms;
 
@@ -1175,7 +1175,7 @@ optimize_symtab(sym_tbl_t *symtab)
 	/*
 	 * Sort the two tables according to the appropriate criteria.
 	 */
-	mutex_lock(&sort_mtx);
+	pthread_mutex_lock(&sort_mtx);
 	sort_strs = symtab->sym_strs;
 	sort_syms = syms;
 
@@ -1184,7 +1184,7 @@ optimize_symtab(sym_tbl_t *symtab)
 
 	sort_strs = NULL;
 	sort_syms = NULL;
-	mutex_unlock(&sort_mtx);
+	pthread_mutex_unlock(&sort_mtx);
 
 	free(syms);
 }