Mesa (master): util: Add os_same_file_description helper
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jan 23 17:04:47 UTC 2020
Module: Mesa
Branch: master
Commit: f76cbc7901f7d500f5a4f74aedfd29970d1efd00
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f76cbc7901f7d500f5a4f74aedfd29970d1efd00
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Mon Jan 6 18:24:52 2020 +0100
util: Add os_same_file_description helper
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3202>
---
src/util/os_file.c | 23 +++++++++++++++++++++++
src/util/os_file.h | 8 ++++++++
2 files changed, 31 insertions(+)
diff --git a/src/util/os_file.c b/src/util/os_file.c
index c670e127c6b..b502ff4b0ef 100644
--- a/src/util/os_file.c
+++ b/src/util/os_file.c
@@ -34,7 +34,9 @@ os_file_create_unique(const char *filename, int filemode)
#if defined(__linux__)
#include <fcntl.h>
+#include <linux/kcmp.h>
#include <sys/stat.h>
+#include <sys/syscall.h>
#include <unistd.h>
@@ -130,8 +132,18 @@ os_read_file(const char *filename)
return buf;
}
+bool
+os_same_file_description(int fd1, int fd2)
+{
+ pid_t pid = getpid();
+
+ return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2) == 0;
+}
+
#else
+#include "u_debug.h"
+
char *
os_read_file(const char *filename)
{
@@ -139,4 +151,15 @@ os_read_file(const char *filename)
return NULL;
}
+bool
+os_same_file_description(int fd1, int fd2)
+{
+ if (fd1 == fd2)
+ return true;
+
+ debug_warn_once("Can't tell if different file descriptors reference the same"
+ " file description, false negatives might cause trouble!\n");
+ return false;
+}
+
#endif
diff --git a/src/util/os_file.h b/src/util/os_file.h
index d691302d12d..1972beba32b 100644
--- a/src/util/os_file.h
+++ b/src/util/os_file.h
@@ -8,6 +8,7 @@
#ifndef _OS_FILE_H_
#define _OS_FILE_H_
+#include <stdbool.h>
#include <stdio.h>
#ifdef __cplusplus
@@ -30,6 +31,13 @@ os_file_create_unique(const char *filename, int filemode);
char *
os_read_file(const char *filename);
+/*
+ * Returns true if the two file descriptors passed in can be determined to
+ * reference the same file description, false otherwise
+ */
+bool
+os_same_file_description(int fd1, int fd2);
+
#ifdef __cplusplus
}
#endif
More information about the mesa-commit
mailing list