fixes seg fault on concurrentKernels, speeds up concurrent_streams_empty, adds check for null stream case on cudaStreamWaitEvent

1 files changed, 4 insertions, 0 deletions

diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc
index f130a37..33da17f 100644
--- a/libcuda/cuda_runtime_api.cc
+++ b/libcuda/cuda_runtime_api.cc
@@ -1203,6 +1203,10 @@ __host__ cudaError_t CUDARTAPI cudaStreamWaitEvent(cudaStream_t stream, cudaEven
 {
 	CUevent_st *e = get_event(event);
 	if( !e ) return g_last_cudaError = cudaErrorUnknown;
+   if (!stream){
+	   printf("GPGPU-Sim API: Warning: cudaStreamWaitEvent on NULL stream not currently supported.\n");
+		return g_last_cudaError = cudaErrorInvalidValue;
+   }
 	struct CUstream_st *s = (struct CUstream_st *)stream;
 	stream_operation op(s,e,flags);
 	g_stream_manager->push(op);