diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 57f4bde..ec1b766 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -58,7 +58,6 @@ libgallium_la_SOURCES = \ os/os_memory.h \ os/os_memory_stdc.h \ os/os_memory_aligned.h \ - os/os_misc.h \ os/os_time.h \ os/os_thread.h diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index f44c350..c7bd341 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_time.c \ tgsi/tgsi_build.c \ tgsi/tgsi_dump.c \ tgsi/tgsi_info.c \ diff --git a/src/gallium/auxiliary/os/os_time.c b/src/gallium/auxiliary/os/os_time.c deleted file mode 100644 index f7e4ca4..0000000 --- a/src/gallium/auxiliary/os/os_time.c +++ /dev/null @@ -1,94 +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. - * - **************************************************************************/ - -/** - * @file - * OS independent time-manipulation functions. - * - * @author Jose Fonseca - */ - - -#include "pipe/p_config.h" - -#if defined(PIPE_OS_UNIX) -# include /* timeval */ -# include /* timeval */ -#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER) -# include -#else -# error Unsupported OS -#endif - -#include "os_time.h" - - -int64_t -os_time_get_nano(void) -{ -#if defined(PIPE_OS_LINUX) - - struct timespec tv; - clock_gettime(CLOCK_MONOTONIC, &tv); - return tv.tv_nsec + tv.tv_sec*INT64_C(1000000000); - -#elif defined(PIPE_OS_UNIX) - - struct timeval tv; - gettimeofday(&tv, NULL); - return tv.tv_usec*INT64_C(1000) + tv.tv_sec*INT64_C(1000000000); - -#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER) - - static LARGE_INTEGER frequency; - LARGE_INTEGER counter; - if(!frequency.QuadPart) - QueryPerformanceFrequency(&frequency); - QueryPerformanceCounter(&counter); - return counter.QuadPart*INT64_C(1000000000)/frequency.QuadPart; - -#else - -#error Unsupported OS - -#endif -} - - -#if defined(PIPE_SUBSYSTEM_WINDOWS_USER) - -void -os_time_sleep(int64_t usecs) -{ - DWORD dwMilliseconds = (DWORD) ((usecs + 999) / 1000); - /* Avoid Sleep(O) as that would cause to sleep for an undetermined duration */ - if (dwMilliseconds) { - Sleep(dwMilliseconds); - } -} - -#endif diff --git a/src/gallium/auxiliary/os/os_time.h b/src/gallium/auxiliary/os/os_time.h deleted file mode 100644 index 74592ff..0000000 --- a/src/gallium/auxiliary/os/os_time.h +++ /dev/null @@ -1,101 +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. - * - **************************************************************************/ - -/** - * @file - * OS independent time-manipulation functions. - * - * @author Jose Fonseca - */ - -#ifndef _OS_TIME_H_ -#define _OS_TIME_H_ - - -#include "pipe/p_config.h" - -#if defined(PIPE_OS_UNIX) -# include /* usleep */ -#endif - -#include "pipe/p_compiler.h" - - -#ifdef __cplusplus -extern "C" { -#endif - - -/* - * Get the current time in nanoseconds from an unknown base. - */ -int64_t -os_time_get_nano(void); - - -/* - * Get the current time in microseconds from an unknown base. - */ -static inline int64_t -os_time_get(void) { - return os_time_get_nano() / 1000; -} - - -/* - * Sleep. - */ -#if defined(PIPE_OS_UNIX) -#define os_time_sleep(_usecs) usleep(_usecs) -#else -void -os_time_sleep(int64_t usecs); -#endif - - -/* - * Helper function for detecting time outs, taking in account overflow. - * - * Returns true if the current time has elapsed beyond the specified interval. - */ -static inline boolean -os_time_timeout(int64_t start, - int64_t end, - int64_t curr) -{ - if(start <= end) - return !(start <= curr && curr < end); - else - return !((start <= curr) || (curr < end)); -} - - -#ifdef __cplusplus -} -#endif - -#endif /* _OS_TIME_H_ */