projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: move os_time.[ch] to src/util
[mesa.git]
/
src
/
gallium
/
auxiliary
/
hud
/
hud_diskstat.c
diff --git
a/src/gallium/auxiliary/hud/hud_diskstat.c
b/src/gallium/auxiliary/hud/hud_diskstat.c
index af6e62d9da5668d88d4a4b65cb800e61dbcb92f2..53b32baef226d663f64b8ad779b481d24a7438fc 100644
(file)
--- a/
src/gallium/auxiliary/hud/hud_diskstat.c
+++ b/
src/gallium/auxiliary/hud/hud_diskstat.c
@@
-34,7
+34,7
@@
#include "hud/hud_private.h"
#include "util/list.h"
#include "hud/hud_private.h"
#include "util/list.h"
-#include "
os
/os_time.h"
+#include "
util
/os_time.h"
#include "os/os_thread.h"
#include "util/u_memory.h"
#include <stdio.h>
#include "os/os_thread.h"
#include "util/u_memory.h"
#include <stdio.h>
@@
-82,7
+82,7
@@
struct diskstat_info
*/
static int gdiskstat_count = 0;
static struct list_head gdiskstat_list;
*/
static int gdiskstat_count = 0;
static struct list_head gdiskstat_list;
-
pipe_static_mutex(gdiskstat_mutex)
;
+
static mtx_t gdiskstat_mutex = _MTX_INITIALIZER_NP
;
static struct diskstat_info *
find_dsi_by_name(const char *n, int mode)
static struct diskstat_info *
find_dsi_by_name(const char *n, int mode)
@@
-246,9
+246,9
@@
hud_get_num_disks(bool displayhelp)
char name[64];
/* Return the number of block devices and partitions. */
char name[64];
/* Return the number of block devices and partitions. */
-
pipe_mutex_lock(
gdiskstat_mutex);
+
mtx_lock(&
gdiskstat_mutex);
if (gdiskstat_count) {
if (gdiskstat_count) {
-
pipe_mutex_unlock(
gdiskstat_mutex);
+
mtx_unlock(&
gdiskstat_mutex);
return gdiskstat_count;
}
return gdiskstat_count;
}
@@
-258,7
+258,7
@@
hud_get_num_disks(bool displayhelp)
list_inithead(&gdiskstat_list);
DIR *dir = opendir("/sys/block/");
if (!dir) {
list_inithead(&gdiskstat_list);
DIR *dir = opendir("/sys/block/");
if (!dir) {
-
pipe_mutex_unlock(
gdiskstat_mutex);
+
mtx_unlock(&
gdiskstat_mutex);
return 0;
}
return 0;
}
@@
-285,7
+285,7
@@
hud_get_num_disks(bool displayhelp)
struct dirent *dpart;
DIR *pdir = opendir(basename);
if (!pdir) {
struct dirent *dpart;
DIR *pdir = opendir(basename);
if (!pdir) {
-
pipe_mutex_unlock(
gdiskstat_mutex);
+
mtx_unlock(&
gdiskstat_mutex);
closedir(dir);
return 0;
}
closedir(dir);
return 0;
}
@@
-320,7
+320,7
@@
hud_get_num_disks(bool displayhelp)
puts(line);
}
}
puts(line);
}
}
-
pipe_mutex_unlock(
gdiskstat_mutex);
+
mtx_unlock(&
gdiskstat_mutex);
return gdiskstat_count;
}
return gdiskstat_count;
}