ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-25 16:29:03 +00:00
Code Packages Projects Releases Wiki Activity

Use std::thread for userevents_multithreaded test (#824)

Browse Source 
The genericThread abstraction is not necessary now that C++11 is
required.
This commit is contained in:
James Price
2020-06-12 05:08:23 -04:00
committed by GitHub
parent e9dc1bc5d2
commit eb4afc9547
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test_conformance/events/test_userevents_multithreaded.cpp
View File

@@ -16,28 +16,19 @@
#include "testBase.h" #include "testBase.h"
#include "action_classes.h" #include "action_classes.h"
#include "harness/conversions.h" #include "harness/conversions.h"
#include "harness/genericThread.h"
#include <thread>
#if !defined (_MSC_VER) #if !defined (_MSC_VER)
#include <unistd.h> #include <unistd.h>
#endif // !_MSC_VER #endif // !_MSC_VER
class releaseEvent_thread : public genericThread void trigger_user_event(cl_event *event)
{ {
public: usleep(1000000);
releaseEvent_thread( cl_event *event ) : mEvent( event ) {} log_info("\tTriggering gate from separate thread...\n");
clSetUserEventStatus(*event, CL_COMPLETE);
cl_event * mEvent; }
protected:
virtual void * IRun( void )
{
usleep( 1000000 );
log_info( "\tTriggering gate from separate thread...\n" );
clSetUserEventStatus( *mEvent, CL_COMPLETE );
return NULL;
}
};
int test_userevents_multithreaded( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements ) int test_userevents_multithreaded( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements )
{ {
@@ -66,14 +57,14 @@ int test_userevents_multithreaded( cl_device_id deviceID, cl_context context, cl
} }
// Now, instead of releasing the gate, we spawn a separate thread to do so // Now, instead of releasing the gate, we spawn a separate thread to do so
releaseEvent_thread thread( &gateEvent );
log_info( "\tStarting trigger thread...\n" ); log_info( "\tStarting trigger thread...\n" );
thread.Start(); std::thread thread(trigger_user_event, &gateEvent);
log_info( "\tWaiting for actions...\n" ); log_info( "\tWaiting for actions...\n" );
error = clWaitForEvents( 3, &actionEvents[ 0 ] ); error = clWaitForEvents( 3, &actionEvents[ 0 ] );
test_error( error, "Unable to wait for action events" ); test_error( error, "Unable to wait for action events" );
thread.join();
log_info( "\tActions completed.\n" ); log_info( "\tActions completed.\n" );
// If we got here without error, we're good // If we got here without error, we're good