From eb2cd7ac9c23cbe4019f75be61b28b5a1f5b866d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 21 Jan 2016 17:50:38 +1000 Subject: [PATCH] gallium: Remove os_process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We aren't using this currently, bring it back if we need it later. Signed-off-by: Marc-André Lureau Signed-off-by: Dave Airlie --- src/gallium/auxiliary/Makefile.am | 1 - src/gallium/auxiliary/Makefile.sources | 1 - src/gallium/auxiliary/os/os_process.c | 92 -------------------------- src/gallium/auxiliary/os/os_process.h | 40 ----------- 4 files changed, 134 deletions(-) delete mode 100644 src/gallium/auxiliary/os/os_process.c delete mode 100644 src/gallium/auxiliary/os/os_process.h diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 393bfa7..57f4bde 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -59,7 +59,6 @@ libgallium_la_SOURCES = \ os/os_memory_stdc.h \ os/os_memory_aligned.h \ os/os_misc.h \ - os/os_process.h \ os/os_time.h \ os/os_thread.h diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 23b1c76..f44c350 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -2,7 +2,6 @@ C_SOURCES := \ cso_cache/cso_cache.c \ cso_cache/cso_hash.c \ os/os_misc.c \ - os/os_process.c \ os/os_time.c \ tgsi/tgsi_build.c \ tgsi/tgsi_dump.c \ diff --git a/src/gallium/auxiliary/os/os_process.c b/src/gallium/auxiliary/os/os_process.c deleted file mode 100644 index 78ed3e2..0000000 --- a/src/gallium/auxiliary/os/os_process.c +++ /dev/null @@ -1,92 +0,0 @@ -/************************************************************************** - * - * Copyright 2013 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 THE AUTHORS 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 "pipe/p_config.h" -#include "os/os_process.h" -#include "util/u_memory.h" - -#if defined(PIPE_SUBSYSTEM_WINDOWS_USER) -# include -#elif defined(__GLIBC__) -# include -#elif defined(PIPE_OS_BSD) || defined(PIPE_OS_APPLE) -# include -#else -#warning unexpected platform in os_process.c -#endif - - -/** - * Return the name of the current process. - * \param procname returns the process name - * \param size size of the procname buffer - * \return TRUE or FALSE for success, failure - */ -boolean -os_get_process_name(char *procname, size_t size) -{ - const char *name; -#if defined(PIPE_SUBSYSTEM_WINDOWS_USER) - char szProcessPath[MAX_PATH]; - char *lpProcessName; - char *lpProcessExt; - - GetModuleFileNameA(NULL, szProcessPath, ARRAY_SIZE(szProcessPath)); - - lpProcessName = strrchr(szProcessPath, '\\'); - lpProcessName = lpProcessName ? lpProcessName + 1 : szProcessPath; - - lpProcessExt = strrchr(lpProcessName, '.'); - if (lpProcessExt) { - *lpProcessExt = '\0'; - } - - name = lpProcessName; - -#elif defined(__GLIBC__) - name = program_invocation_short_name; -#elif defined(PIPE_OS_BSD) || defined(PIPE_OS_APPLE) - /* *BSD and OS X */ - name = getprogname(); -#else -#warning unexpected platform in os_process.c - return FALSE; -#endif - - assert(size > 0); - assert(procname); - - if (name && procname && size > 0) { - strncpy(procname, name, size); - procname[size - 1] = '\0'; - return TRUE; - } - else { - return FALSE; - } -} diff --git a/src/gallium/auxiliary/os/os_process.h b/src/gallium/auxiliary/os/os_process.h deleted file mode 100644 index 0d50ddc..0000000 --- a/src/gallium/auxiliary/os/os_process.h +++ /dev/null @@ -1,40 +0,0 @@ -/************************************************************************** - * - * Copyright 2013 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 THE AUTHORS 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. - * - **************************************************************************/ - - -#ifndef OS_PROCESS_H -#define OS_PROCESS_H - - -#include "pipe/p_compiler.h" - - -extern boolean -os_get_process_name(char *str, size_t size); - - -#endif /* OS_PROCESS_H */