|
|
afd8de |
From cd24e64b088c692c74f4383241df8d48d1007b31 Mon Sep 17 00:00:00 2001
|
|
|
afd8de |
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
|
|
|
afd8de |
Date: Mon, 6 Jan 2020 18:24:52 +0100
|
|
|
afd8de |
Subject: [PATCH 4/8] util: Add os_same_file_description helper
|
|
|
afd8de |
MIME-Version: 1.0
|
|
|
afd8de |
Content-Type: text/plain; charset=UTF-8
|
|
|
afd8de |
Content-Transfer-Encoding: 8bit
|
|
|
afd8de |
|
|
|
afd8de |
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
|
|
|
afd8de |
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3202>
|
|
|
afd8de |
|
|
|
afd8de |
(cherry picked from commit f76cbc7901f7d500f5a4f74aedfd29970d1efd00)
|
|
|
afd8de |
|
|
|
afd8de |
Signed-off-by: Michel Dänzer <mdaenzer@redhat.com>
|
|
|
afd8de |
---
|
|
|
afd8de |
src/util/Makefile.sources | 2 +
|
|
|
afd8de |
src/util/meson.build | 1 +
|
|
|
afd8de |
src/util/os_file.c | 165 ++++++++++++++++++++++++++++++++++++++
|
|
|
afd8de |
src/util/os_file.h | 45 +++++++++++
|
|
|
afd8de |
4 files changed, 213 insertions(+)
|
|
|
afd8de |
create mode 100644 src/util/os_file.c
|
|
|
afd8de |
create mode 100644 src/util/os_file.h
|
|
|
afd8de |
|
|
|
afd8de |
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
|
|
|
afd8de |
index b4d23947ab7..02e7a5e598b 100644
|
|
|
afd8de |
--- a/src/util/Makefile.sources
|
|
|
afd8de |
+++ b/src/util/Makefile.sources
|
|
|
afd8de |
@@ -27,6 +27,8 @@ MESA_UTIL_FILES := \
|
|
|
afd8de |
mesa-sha1.h \
|
|
|
afd8de |
os_time.c \
|
|
|
afd8de |
os_time.h \
|
|
|
afd8de |
+ os_file.c \
|
|
|
afd8de |
+ os_file.h \
|
|
|
afd8de |
os_misc.c \
|
|
|
afd8de |
os_misc.h \
|
|
|
afd8de |
u_process.c \
|
|
|
afd8de |
diff --git a/src/util/meson.build b/src/util/meson.build
|
|
|
afd8de |
index 156621aff65..d612e31952d 100644
|
|
|
afd8de |
--- a/src/util/meson.build
|
|
|
afd8de |
+++ b/src/util/meson.build
|
|
|
afd8de |
@@ -51,6 +51,7 @@ files_mesa_util = files(
|
|
|
afd8de |
'mesa-sha1.h',
|
|
|
afd8de |
'os_time.c',
|
|
|
afd8de |
'os_time.h',
|
|
|
afd8de |
+ 'os_file.c',
|
|
|
afd8de |
'os_misc.c',
|
|
|
afd8de |
'os_misc.h',
|
|
|
afd8de |
'u_process.c',
|
|
|
afd8de |
diff --git a/src/util/os_file.c b/src/util/os_file.c
|
|
|
afd8de |
new file mode 100644
|
|
|
afd8de |
index 00000000000..b502ff4b0ef
|
|
|
afd8de |
--- /dev/null
|
|
|
afd8de |
+++ b/src/util/os_file.c
|
|
|
afd8de |
@@ -0,0 +1,165 @@
|
|
|
afd8de |
+/*
|
|
|
afd8de |
+ * Copyright 2019 Intel Corporation
|
|
|
afd8de |
+ * SPDX-License-Identifier: MIT
|
|
|
afd8de |
+ */
|
|
|
afd8de |
+
|
|
|
afd8de |
+#include "os_file.h"
|
|
|
afd8de |
+
|
|
|
afd8de |
+#include <errno.h>
|
|
|
afd8de |
+#include <fcntl.h>
|
|
|
afd8de |
+#include <stdlib.h>
|
|
|
afd8de |
+#include <sys/stat.h>
|
|
|
afd8de |
+
|
|
|
afd8de |
+
|
|
|
afd8de |
+#if defined(WIN32)
|
|
|
afd8de |
+#include <io.h>
|
|
|
afd8de |
+#define open _open
|
|
|
afd8de |
+#define fdopen _fdopen
|
|
|
afd8de |
+#define O_CREAT _O_CREAT
|
|
|
afd8de |
+#define O_EXCL _O_EXCL
|
|
|
afd8de |
+#define O_WRONLY _O_WRONLY
|
|
|
afd8de |
+#endif
|
|
|
afd8de |
+
|
|
|
afd8de |
+
|
|
|
afd8de |
+FILE *
|
|
|
afd8de |
+os_file_create_unique(const char *filename, int filemode)
|
|
|
afd8de |
+{
|
|
|
afd8de |
+ int fd = open(filename, O_CREAT | O_EXCL | O_WRONLY, filemode);
|
|
|
afd8de |
+ if (fd == -1)
|
|
|
afd8de |
+ return NULL;
|
|
|
afd8de |
+ return fdopen(fd, "w");
|
|
|
afd8de |
+}
|
|
|
afd8de |
+
|
|
|
afd8de |
+
|
|
|
afd8de |
+#if defined(__linux__)
|
|
|
afd8de |
+
|
|
|
afd8de |
+#include <fcntl.h>
|
|
|
afd8de |
+#include <linux/kcmp.h>
|
|
|
afd8de |
+#include <sys/stat.h>
|
|
|
afd8de |
+#include <sys/syscall.h>
|
|
|
afd8de |
+#include <unistd.h>
|
|
|
afd8de |
+
|
|
|
afd8de |
+
|
|
|
afd8de |
+static ssize_t
|
|
|
afd8de |
+readN(int fd, char *buf, size_t len)
|
|
|
afd8de |
+{
|
|
|
afd8de |
+ int err = -ENODATA;
|
|
|
afd8de |
+ size_t total = 0;
|
|
|
afd8de |
+ do {
|
|
|
afd8de |
+ ssize_t ret = read(fd, buf + total, len - total);
|
|
|
afd8de |
+
|
|
|
afd8de |
+ if (ret < 0)
|
|
|
afd8de |
+ ret = -errno;
|
|
|
afd8de |
+
|
|
|
afd8de |
+ if (ret == -EINTR || ret == -EAGAIN)
|
|
|
afd8de |
+ continue;
|
|
|
afd8de |
+
|
|
|
afd8de |
+ if (ret <= 0) {
|
|
|
afd8de |
+ err = ret;
|
|
|
afd8de |
+ break;
|
|
|
afd8de |
+ }
|
|
|
afd8de |
+
|
|
|
afd8de |
+ total += ret;
|
|
|
afd8de |
+ } while (total != len);
|
|
|
afd8de |
+
|
|
|
afd8de |
+ return total ? (ssize_t)total : err;
|
|
|
afd8de |
+}
|
|
|
afd8de |
+
|
|
|
afd8de |
+char *
|
|
|
afd8de |
+os_read_file(const char *filename)
|
|
|
afd8de |
+{
|
|
|
afd8de |
+ /* Note that this also serves as a slight margin to avoid a 2x grow when
|
|
|
afd8de |
+ * the file is just a few bytes larger when we read it than when we
|
|
|
afd8de |
+ * fstat'ed it.
|
|
|
afd8de |
+ * The string's NULL terminator is also included in here.
|
|
|
afd8de |
+ */
|
|
|
afd8de |
+ size_t len = 64;
|
|
|
afd8de |
+
|
|
|
afd8de |
+ int fd = open(filename, O_RDONLY);
|
|
|
afd8de |
+ if (fd == -1) {
|
|
|
afd8de |
+ /* errno set by open() */
|
|
|
afd8de |
+ return NULL;
|
|
|
afd8de |
+ }
|
|
|
afd8de |
+
|
|
|
afd8de |
+ /* Pre-allocate a buffer at least the size of the file if we can read
|
|
|
afd8de |
+ * that information.
|
|
|
afd8de |
+ */
|
|
|
afd8de |
+ struct stat stat;
|
|
|
afd8de |
+ if (fstat(fd, &stat) == 0)
|
|
|
afd8de |
+ len += stat.st_size;
|
|
|
afd8de |
+
|
|
|
afd8de |
+ char *buf = malloc(len);
|
|
|
afd8de |
+ if (!buf) {
|
|
|
afd8de |
+ close(fd);
|
|
|
afd8de |
+ errno = -ENOMEM;
|
|
|
afd8de |
+ return NULL;
|
|
|
afd8de |
+ }
|
|
|
afd8de |
+
|
|
|
afd8de |
+ ssize_t actually_read;
|
|
|
afd8de |
+ size_t offset = 0, remaining = len - 1;
|
|
|
afd8de |
+ while ((actually_read = readN(fd, buf + offset, remaining)) == (ssize_t)remaining) {
|
|
|
afd8de |
+ char *newbuf = realloc(buf, 2 * len);
|
|
|
afd8de |
+ if (!newbuf) {
|
|
|
afd8de |
+ free(buf);
|
|
|
afd8de |
+ close(fd);
|
|
|
afd8de |
+ errno = -ENOMEM;
|
|
|
afd8de |
+ return NULL;
|
|
|
afd8de |
+ }
|
|
|
afd8de |
+
|
|
|
afd8de |
+ buf = newbuf;
|
|
|
afd8de |
+ len *= 2;
|
|
|
afd8de |
+ offset += actually_read;
|
|
|
afd8de |
+ remaining = len - offset - 1;
|
|
|
afd8de |
+ }
|
|
|
afd8de |
+
|
|
|
afd8de |
+ close(fd);
|
|
|
afd8de |
+
|
|
|
afd8de |
+ if (actually_read > 0)
|
|
|
afd8de |
+ offset += actually_read;
|
|
|
afd8de |
+
|
|
|
afd8de |
+ /* Final resize to actual size */
|
|
|
afd8de |
+ len = offset + 1;
|
|
|
afd8de |
+ char *newbuf = realloc(buf, len);
|
|
|
afd8de |
+ if (!newbuf) {
|
|
|
afd8de |
+ free(buf);
|
|
|
afd8de |
+ errno = -ENOMEM;
|
|
|
afd8de |
+ return NULL;
|
|
|
afd8de |
+ }
|
|
|
afd8de |
+ buf = newbuf;
|
|
|
afd8de |
+
|
|
|
afd8de |
+ buf[offset] = '\0';
|
|
|
afd8de |
+
|
|
|
afd8de |
+ return buf;
|
|
|
afd8de |
+}
|
|
|
afd8de |
+
|
|
|
afd8de |
+bool
|
|
|
afd8de |
+os_same_file_description(int fd1, int fd2)
|
|
|
afd8de |
+{
|
|
|
afd8de |
+ pid_t pid = getpid();
|
|
|
afd8de |
+
|
|
|
afd8de |
+ return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2) == 0;
|
|
|
afd8de |
+}
|
|
|
afd8de |
+
|
|
|
afd8de |
+#else
|
|
|
afd8de |
+
|
|
|
afd8de |
+#include "u_debug.h"
|
|
|
afd8de |
+
|
|
|
afd8de |
+char *
|
|
|
afd8de |
+os_read_file(const char *filename)
|
|
|
afd8de |
+{
|
|
|
afd8de |
+ errno = -ENOSYS;
|
|
|
afd8de |
+ return NULL;
|
|
|
afd8de |
+}
|
|
|
afd8de |
+
|
|
|
afd8de |
+bool
|
|
|
afd8de |
+os_same_file_description(int fd1, int fd2)
|
|
|
afd8de |
+{
|
|
|
afd8de |
+ if (fd1 == fd2)
|
|
|
afd8de |
+ return true;
|
|
|
afd8de |
+
|
|
|
afd8de |
+ debug_warn_once("Can't tell if different file descriptors reference the same"
|
|
|
afd8de |
+ " file description, false negatives might cause trouble!\n");
|
|
|
afd8de |
+ return false;
|
|
|
afd8de |
+}
|
|
|
afd8de |
+
|
|
|
afd8de |
+#endif
|
|
|
afd8de |
diff --git a/src/util/os_file.h b/src/util/os_file.h
|
|
|
afd8de |
new file mode 100644
|
|
|
afd8de |
index 00000000000..1972beba32b
|
|
|
afd8de |
--- /dev/null
|
|
|
afd8de |
+++ b/src/util/os_file.h
|
|
|
afd8de |
@@ -0,0 +1,45 @@
|
|
|
afd8de |
+/*
|
|
|
afd8de |
+ * Copyright 2019 Intel Corporation
|
|
|
afd8de |
+ * SPDX-License-Identifier: MIT
|
|
|
afd8de |
+ *
|
|
|
afd8de |
+ * File operations helpers
|
|
|
afd8de |
+ */
|
|
|
afd8de |
+
|
|
|
afd8de |
+#ifndef _OS_FILE_H_
|
|
|
afd8de |
+#define _OS_FILE_H_
|
|
|
afd8de |
+
|
|
|
afd8de |
+#include <stdbool.h>
|
|
|
afd8de |
+#include <stdio.h>
|
|
|
afd8de |
+
|
|
|
afd8de |
+#ifdef __cplusplus
|
|
|
afd8de |
+extern "C" {
|
|
|
afd8de |
+#endif
|
|
|
afd8de |
+
|
|
|
afd8de |
+/*
|
|
|
afd8de |
+ * Create a new file and opens it for writing-only.
|
|
|
afd8de |
+ * If the given filename already exists, nothing is done and NULL is returned.
|
|
|
afd8de |
+ * `errno` gets set to the failure reason; if that is not EEXIST, the caller
|
|
|
afd8de |
+ * might want to do something other than trying again.
|
|
|
afd8de |
+ */
|
|
|
afd8de |
+FILE *
|
|
|
afd8de |
+os_file_create_unique(const char *filename, int filemode);
|
|
|
afd8de |
+
|
|
|
afd8de |
+/*
|
|
|
afd8de |
+ * Read a file.
|
|
|
afd8de |
+ * Returns a char* that the caller must free(), or NULL and sets errno.
|
|
|
afd8de |
+ */
|
|
|
afd8de |
+char *
|
|
|
afd8de |
+os_read_file(const char *filename);
|
|
|
afd8de |
+
|
|
|
afd8de |
+/*
|
|
|
afd8de |
+ * Returns true if the two file descriptors passed in can be determined to
|
|
|
afd8de |
+ * reference the same file description, false otherwise
|
|
|
afd8de |
+ */
|
|
|
afd8de |
+bool
|
|
|
afd8de |
+os_same_file_description(int fd1, int fd2);
|
|
|
afd8de |
+
|
|
|
afd8de |
+#ifdef __cplusplus
|
|
|
afd8de |
+}
|
|
|
afd8de |
+#endif
|
|
|
afd8de |
+
|
|
|
afd8de |
+#endif /* _OS_FILE_H_ */
|
|
|
afd8de |
--
|
|
|
afd8de |
2.26.2
|
|
|
afd8de |
|