diff options
| author | Tim Rowley <[email protected]> | 2017-07-21 11:38:39 -0500 |
|---|---|---|
| committer | Tim Rowley <[email protected]> | 2017-07-21 15:37:56 -0500 |
| commit | d1e7153228304eb1be85580cbfdea1a57c5f203b (patch) | |
| tree | dcf2bb31edd3b4769324aa90e1f4837ff1cdc3c5 /src/gallium | |
| parent | eaa56eab6da565c7bc84419c025c7c9bc90cf87a (diff) | |
swr/rast: quit using linux-specific gettid()
Linux-specific gettid() syscall shouldn't be used in portable code.
Fix does assume a 1:1 thread:LWP architecture, but works for our
current target platforms and can be revisited later if needed.
Fixes unresolved symbol in linux scons builds.
v2: add comment in code about the 1:1 assumption.
Cc: [email protected]
Reviewed-by: Bruce Cherniak <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/common/os.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp index 3a618a124de..9017e8dc7d8 100644 --- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp +++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp @@ -67,8 +67,9 @@ namespace ArchRast char buf[255]; // There could be multiple threads creating thread pools. We // want to make sure they are uniquly identified by adding in - // the creator's thread id into the filename. - sprintf(buf, "%s/ar_event%d_%d.bin", "/tmp", GetCurrentThreadId(), id); + // the creator's thread (process) id into the filename. + // Assumes a 1:1 thread:LWP mapping as in linux. + sprintf(buf, "%s/ar_event%d_%d.bin", "/tmp", GetCurrentProcessId(), id); mFilename = std::string(buf); #endif } diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h index a16f5779d82..dc90fca7501 100644 --- a/src/gallium/drivers/swr/rasterizer/common/os.h +++ b/src/gallium/drivers/swr/rasterizer/common/os.h @@ -237,8 +237,6 @@ void AlignedFree(void* p) #define sprintf_s sprintf #define strcpy_s(dst,size,src) strncpy(dst,src,size) #define GetCurrentProcessId getpid -pid_t gettid(void); -#define GetCurrentThreadId gettid #define InterlockedCompareExchange(Dest, Exchange, Comparand) __sync_val_compare_and_swap(Dest, Comparand, Exchange) #define InterlockedExchangeAdd(Addend, Value) __sync_fetch_and_add(Addend, Value) |