Mesa (master): nir/spirv: improve mmap() error handling
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Sat Oct 1 22:37:51 UTC 2016
Module: Mesa
Branch: master
Commit: c86793804498a33e36302b670d3a8b095f9bdc93
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c86793804498a33e36302b670d3a8b095f9bdc93
Author: Eric Engestrom <eric at engestrom.ch>
Date: Sun Sep 25 16:49:52 2016 +0100
nir/spirv: improve mmap() error handling
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
---
src/compiler/spirv/spirv2nir.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/compiler/spirv/spirv2nir.c b/src/compiler/spirv/spirv2nir.c
index a024028..3dc0735 100644
--- a/src/compiler/spirv/spirv2nir.c
+++ b/src/compiler/spirv/spirv2nir.c
@@ -38,6 +38,8 @@
#include <fcntl.h>
#include <unistd.h>
#include <stdio.h>
+#include <errno.h>
+#include <string.h>
#define WORD_SIZE 4
@@ -62,7 +64,13 @@ int main(int argc, char **argv)
size_t word_count = len / WORD_SIZE;
const void *map = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
- assert(map != NULL);
+ if (map == MAP_FAILED)
+ {
+ fprintf(stderr, "Failed to mmap the file: errno=%d, %s\n",
+ errno, strerror(errno));
+ close(fd);
+ return 1;
+ }
nir_function *func = spirv_to_nir(map, word_count, NULL, 0,
MESA_SHADER_FRAGMENT, "main", NULL);
More information about the mesa-commit
mailing list