resolving merge conflict

1 files changed, 11 insertions, 1 deletions

diff --git a/src/stream_manager.h b/src/stream_manager.h
index d3a804f..91d1b36 100644
--- a/src/stream_manager.h
+++ b/src/stream_manager.h
@@ -51,7 +51,8 @@ enum stream_operation_type {
     stream_memcpy_to_symbol,
     stream_memcpy_from_symbol,
     stream_kernel_launch,
-    stream_event
+    stream_event,
+    stream_wait_event
 };
 
 class stream_operation {
@@ -101,6 +102,14 @@ public:
         m_stream=stream;
         m_done=false;
     }
+    stream_operation( struct CUstream_st *stream, class CUevent_st *e, unsigned int flags )
+    {
+        m_kernel=NULL;
+        m_type=stream_wait_event;
+        m_event=e;
+        m_stream=stream;
+        m_done=false;
+    }
     stream_operation( const void *host_address_src, size_t device_address_dst, size_t cnt, struct CUstream_st *stream )
     {
         m_kernel=NULL;
@@ -246,6 +255,7 @@ public:
     bool empty();
     void print( FILE *fp);
     void push( stream_operation op );
+    void pushCudaStreamWaitEventToAllStreams( CUevent_st *e, unsigned int flags );
     bool operation(bool * sim);
     void stop_all_running_kernels();
 private: