From 46a7fbe92f8779cbd006107c2a20890fd8cbaf5b Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Wed, 20 Nov 2019 17:06:05 -0800 Subject: [PATCH] fix old threading examples --- examples/MultiThreading/MultiThreadingExample.cpp | 9 +++++---- examples/MultiThreading/main.cpp | 10 +++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/examples/MultiThreading/MultiThreadingExample.cpp b/examples/MultiThreading/MultiThreadingExample.cpp index c63a0b363..b9701fb7e 100644 --- a/examples/MultiThreading/MultiThreadingExample.cpp +++ b/examples/MultiThreading/MultiThreadingExample.cpp @@ -29,13 +29,14 @@ void SamplelsMemoryReleaseFunc(void* ptr); #ifndef _WIN32 #include "b3PosixThreadSupport.h" + b3ThreadSupportInterface* createThreadSupport(int numThreads) { b3PosixThreadSupport::ThreadConstructionInfo constructionInfo("testThreads", - SampleThreadFunc, - SamplelsMemoryFunc, - SamplelsMemoryReleaseFunc, - numThreads); + SampleThreadFunc, + SamplelsMemoryFunc, + SamplelsMemoryReleaseFunc, + numThreads); b3ThreadSupportInterface* threadSupport = new b3PosixThreadSupport(constructionInfo); return threadSupport; diff --git a/examples/MultiThreading/main.cpp b/examples/MultiThreading/main.cpp index f2dcd13dc..561f17c21 100644 --- a/examples/MultiThreading/main.cpp +++ b/examples/MultiThreading/main.cpp @@ -22,7 +22,7 @@ subject to the following restrictions: void SampleThreadFunc(void* userPtr, void* lsMemory); void* SamplelsMemoryFunc(); - +void SamplelsMemoryReleaseFunc(void* ptr); #include //#include "BulletMultiThreaded/PlatformDefinitions.h" @@ -34,6 +34,7 @@ b3ThreadSupportInterface* createThreadSupport(int numThreads) b3PosixThreadSupport::ThreadConstructionInfo constructionInfo("testThreads", SampleThreadFunc, SamplelsMemoryFunc, +SamplelsMemoryReleaseFunc, numThreads); b3ThreadSupportInterface* threadSupport = new b3PosixThreadSupport(constructionInfo); @@ -99,6 +100,13 @@ void* SamplelsMemoryFunc() return new SampleThreadLocalStorage; } +void SamplelsMemoryReleaseFunc(void* ptr) +{ + SampleThreadLocalStorage* p = (SampleThreadLocalStorage*)ptr; + delete p; +} + + int main(int argc, char** argv) { int numThreads = 8;