seg fault fix

2 files changed, 11 insertions, 6 deletions

diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc
index de6d5a5..f130a37 100644
--- a/libcuda/cuda_runtime_api.cc
+++ b/libcuda/cuda_runtime_api.cc
@@ -1157,12 +1157,6 @@ __host__ cudaError_t CUDARTAPI cudaStreamQuery(cudaStream_t stream)
 #endif
 }
 
-__host__ cudaError_t CUDARTAPI cudaStreamWaitEvent(cudaStream_t stream, cudaEvent_t event, unsigned int flags)
-{
-   stream->push(stream_operation(stream, event, flags));
-	return g_last_cudaError = cudaSuccess;
-}
-
 /*******************************************************************************
  *                                                                              *
  *                                                                              *
@@ -1205,6 +1199,16 @@ __host__ cudaError_t CUDARTAPI cudaEventRecord(cudaEvent_t event, cudaStream_t s
 	return g_last_cudaError = cudaSuccess;
 }
 
+__host__ cudaError_t CUDARTAPI cudaStreamWaitEvent(cudaStream_t stream, cudaEvent_t event, unsigned int flags)
+{
+	CUevent_st *e = get_event(event);
+	if( !e ) return g_last_cudaError = cudaErrorUnknown;
+	struct CUstream_st *s = (struct CUstream_st *)stream;
+	stream_operation op(s,e,flags);
+	g_stream_manager->push(op);
+	return g_last_cudaError = cudaSuccess;
+}
+
 __host__ cudaError_t CUDARTAPI cudaEventQuery(cudaEvent_t event)
 {
 	CUevent_st *e = get_event(event);
diff --git a/src/stream_manager.cc b/src/stream_manager.cc
index 5b886ab..1b8ebb1 100644
--- a/src/stream_manager.cc
+++ b/src/stream_manager.cc
@@ -199,6 +199,7 @@ bool stream_operation::do_operation( gpgpu_sim *gpu )
         if(g_debug_execution >= 3)
             printf("stream wait event\n");
         if(m_event->done())
+            printf("stream wait event done\n");
             m_stream->record_next_done();
         }
         break;