util: Move os_misc to util

this is needed by u_debug

Tested-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

10 files changed, 6 insertions, 288 deletions

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 923ffb2383c..75df7d0717a 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -106,8 +106,6 @@ C_SOURCES := \
 	os/os_memory_debug.h \
 	os/os_memory_stdc.h \
 	os/os_memory.h \
-	os/os_misc.c \
-	os/os_misc.h \
 	os/os_mman.h \
 	os/os_process.c \
 	os/os_process.h \
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 656955c621a..9c158b6b373 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -126,8 +126,6 @@ files_libgallium = files(
   'os/os_memory_debug.h',
   'os/os_memory_stdc.h',
   'os/os_memory.h',
-  'os/os_misc.c',
-  'os/os_misc.h',
   'os/os_mman.h',
   'os/os_process.c',
   'os/os_process.h',
diff --git a/src/gallium/auxiliary/os/os_misc.c b/src/gallium/auxiliary/os/os_misc.c
deleted file mode 100644
index 09d4400e082..00000000000
--- a/src/gallium/auxiliary/os/os_misc.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008-2010 Vmware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-
-#include "os_misc.h"
-
-#include <stdarg.h>
-
-
-#if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN      // Exclude rarely-used stuff from Windows headers
-#endif
-#include <windows.h>
-#include <stdio.h>
-
-#else
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#endif
-
-
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
-#  include <unistd.h>
-#elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD)
-#  include <sys/sysctl.h>
-#elif defined(PIPE_OS_HAIKU)
-#  include <kernel/OS.h>
-#elif defined(PIPE_OS_WINDOWS)
-#  include <windows.h>
-#else
-#error unexpected platform in os_sysinfo.c
-#endif
-
-
-void
-os_log_message(const char *message)
-{
-   /* If the GALLIUM_LOG_FILE environment variable is set to a valid filename,
-    * write all messages to that file.
-    */
-   static FILE *fout = NULL;
-
-   if (!fout) {
-#ifdef DEBUG
-      /* one-time init */
-      const char *filename = os_get_option("GALLIUM_LOG_FILE");
-      if (filename) {
-         const char *mode = "w";
-         if (filename[0] == '+') {
-            /* If the filename is prefixed with '+' then open the file for
-             * appending instead of normal writing.
-             */
-            mode = "a";
-            filename++; /* skip the '+' */
-         }
-         fout = fopen(filename, mode);
-      }
-#endif
-      if (!fout)
-         fout = stderr;
-   }
-
-#if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
-   OutputDebugStringA(message);
-   if(GetConsoleWindow() && !IsDebuggerPresent()) {
-      fflush(stdout);
-      fputs(message, fout);
-      fflush(fout);
-   }
-   else if (fout != stderr) {
-      fputs(message, fout);
-      fflush(fout);
-   }
-#else /* !PIPE_SUBSYSTEM_WINDOWS */
-   fflush(stdout);
-   fputs(message, fout);
-   fflush(fout);
-#endif
-}
-
-
-#if !defined(PIPE_SUBSYSTEM_EMBEDDED)
-const char *
-os_get_option(const char *name)
-{
-   return getenv(name);
-}
-#endif /* !PIPE_SUBSYSTEM_EMBEDDED */
-
-
-/**
- * Return the size of the total physical memory.
- * \param size returns the size of the total physical memory
- * \return true for success, or false on failure
- */
-bool
-os_get_total_physical_memory(uint64_t *size)
-{
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
-   const long phys_pages = sysconf(_SC_PHYS_PAGES);
-   const long page_size = sysconf(_SC_PAGE_SIZE);
-
-   if (phys_pages <= 0 || page_size <= 0)
-      return false;
-
-   *size = (uint64_t)phys_pages * (uint64_t)page_size;
-   return true;
-#elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD)
-   size_t len = sizeof(*size);
-   int mib[2];
-
-   mib[0] = CTL_HW;
-#if defined(PIPE_OS_APPLE)
-   mib[1] = HW_MEMSIZE;
-#elif defined(PIPE_OS_NETBSD) || defined(PIPE_OS_OPENBSD)
-   mib[1] = HW_PHYSMEM64;
-#elif defined(PIPE_OS_FREEBSD)
-   mib[1] = HW_REALMEM;
-#elif defined(PIPE_OS_DRAGONFLY)
-   mib[1] = HW_PHYSMEM;
-#else
-#error Unsupported *BSD
-#endif
-
-   return (sysctl(mib, 2, size, &len, NULL, 0) == 0);
-#elif defined(PIPE_OS_HAIKU)
-   system_info info;
-   status_t ret;
-
-   ret = get_system_info(&info);
-   if (ret != B_OK || info.max_pages <= 0)
-      return false;
-
-   *size = (uint64_t)info.max_pages * (uint64_t)B_PAGE_SIZE;
-   return true;
-#elif defined(PIPE_OS_WINDOWS)
-   MEMORYSTATUSEX status;
-   BOOL ret;
-
-   status.dwLength = sizeof(status);
-   ret = GlobalMemoryStatusEx(&status);
-   *size = status.ullTotalPhys;
-   return (ret == TRUE);
-#else
-#error unexpected platform in os_sysinfo.c
-   return false;
-#endif
-}
diff --git a/src/gallium/auxiliary/os/os_misc.h b/src/gallium/auxiliary/os/os_misc.h
deleted file mode 100644
index 403c8ee6ec5..00000000000
--- a/src/gallium/auxiliary/os/os_misc.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 Vmware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-
-/*
- * Miscellaneous OS services.
- */
-
-
-#ifndef _OS_MISC_H_
-#define _OS_MISC_H_
-
-
-#include "pipe/p_compiler.h"
-
-
-#if defined(PIPE_OS_UNIX)
-#  include <signal.h> /* for kill() */
-#  include <unistd.h> /* getpid() */
-#endif
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
-/*
- * Trap into the debugger.
- */
-#if (defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)) && defined(PIPE_CC_GCC)
-#  define os_break() __asm("int3")
-#elif defined(PIPE_CC_MSVC)
-#  define os_break()  __debugbreak()
-#elif defined(PIPE_OS_UNIX)
-#  define os_break() kill(getpid(), SIGTRAP)
-#else
-#  define os_break() abort()
-#endif
-
-
-/*
- * Abort the program.
- */
-#if defined(DEBUG)
-#  define os_abort() do { os_break(); abort(); } while(0)
-#else
-#  define os_abort() abort()
-#endif
-
-
-/*
- * Output a message. Message should preferably end in a newline.
- */
-void
-os_log_message(const char *message);
-
-
-/*
- * Get an option. Should return NULL if specified option is not set.
- */
-const char *
-os_get_option(const char *name);
-
-
-/*
- * Get the total amount of physical memory available on the system.
- */
-bool
-os_get_total_physical_memory(uint64_t *size);
-
-
-#ifdef	__cplusplus
-}
-#endif
-
-
-#endif /* _OS_MISC_H_ */
diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index bd946e6b01d..b3505caebfd 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -39,7 +39,7 @@
 #define U_DEBUG_H_
 
 
-#include "os/os_misc.h"
+#include "util/os_misc.h"
 
 #if defined(PIPE_OS_HAIKU)
 /* Haiku provides debug_printf in libroot with OS.h */
diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
index 169f502f05a..a7b4a43c015 100644
--- a/src/gallium/drivers/i915/i915_screen.c
+++ b/src/gallium/drivers/i915/i915_screen.c
@@ -27,7 +27,7 @@
 
 
 #include "draw/draw_context.h"
-#include "os/os_misc.h"
+#include "util/os_misc.h"
 #include "util/u_format.h"
 #include "util/u_format_s3tc.h"
 #include "util/u_inlines.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index f706bf9c9c4..c95016a6cbe 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -38,7 +38,7 @@
 #include "draw/draw_context.h"
 #include "gallivm/lp_bld_type.h"
 
-#include "os/os_misc.h"
+#include "util/os_misc.h"
 #include "util/os_time.h"
 #include "lp_texture.h"
 #include "lp_fence.h"
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index bd8f655838a..44e48cc7ee4 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -31,7 +31,7 @@
 #include "util/u_format_s3tc.h"
 #include "util/u_screen.h"
 #include "util/u_video.h"
-#include "os/os_misc.h"
+#include "util/os_misc.h"
 #include "util/os_time.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
index 5a8400dcf01..1d59dbfc12a 100644
--- a/src/gallium/drivers/v3d/v3d_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "os/os_misc.h"
+#include "util/os_misc.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
index 13fd5ac5440..14ee6cf09e5 100644
--- a/src/gallium/drivers/vc4/vc4_screen.c
+++ b/src/gallium/drivers/vc4/vc4_screen.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "os/os_misc.h"
+#include "util/os_misc.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"