From 6cc22b737fdad9ccf13a2d9055f1508458cc9c50 Mon Sep 17 00:00:00 2001
From: HexToString <506181616@qq.com>
Date: Thu, 14 Oct 2021 12:12:42 +0000
Subject: [PATCH] fix parallel bug

---
 core/predictor/framework/bsf-inl.h |  1 +
 core/predictor/framework/bsf.h     | 37 ++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/core/predictor/framework/bsf-inl.h b/core/predictor/framework/bsf-inl.h
index 7cd8f149..401c5109 100755
--- a/core/predictor/framework/bsf-inl.h
+++ b/core/predictor/framework/bsf-inl.h
@@ -215,6 +215,7 @@ TaskHandler<TaskT> TaskExecutor<TaskT>::schedule(
     LOG(ERROR) << "Failed get TaskT from object pool";
     return TaskHandler<TaskT>::valid_handle();
   }
+  task->clear();
 
   /*
   if (!BatchTasks<TaskT>::check_valid(in, out, _overrun)) {
diff --git a/core/predictor/framework/bsf.h b/core/predictor/framework/bsf.h
index aa3aab56..17f0c3d2 100755
--- a/core/predictor/framework/bsf.h
+++ b/core/predictor/framework/bsf.h
@@ -99,7 +99,40 @@ struct Task {
     outLodTensorVector.clear();
   }
   ~Task() {
+    read_fd = -1;
+    write_fd = -1;
+    owner_tid = -1;
+    inVectorT_ptr = NULL;
+    outVectorT_ptr = NULL;
+    set_feed_lod_index.clear();
+    set_feed_nobatch_index.clear();
+    vector_fetch_lod_index.clear();
+    set_fetch_nobatch_index.clear();
+    rem = -1;
+    total_feed_batch = 0;
+    taskmeta_num = 0;
+    index.store(0, butil::memory_order_relaxed);
     THREAD_MUTEX_DESTROY(&task_mut);
+    fetch_init = false;
+    outLodTensorVector.clear();
+  }
+
+  void clear(){
+    read_fd = -1;
+    write_fd = -1;
+    owner_tid = -1;
+    inVectorT_ptr = NULL;
+    outVectorT_ptr = NULL;
+    set_feed_lod_index.clear();
+    set_feed_nobatch_index.clear();
+    vector_fetch_lod_index.clear();
+    set_fetch_nobatch_index.clear();
+    rem = -1;
+    total_feed_batch = 0;
+    taskmeta_num = 0;
+    index.store(0, butil::memory_order_relaxed);
+    THREAD_MUTEX_INIT(&task_mut, NULL);
+    fetch_init = false;
     outLodTensorVector.clear();
   }
 
@@ -323,7 +356,7 @@ struct Task {
         size_t feedvar_index = vector_fetch_lod_index[index];
         // 由于PaddleTensor的resize实现，是每次都会清空，所以必须先统计总长度。
         for (size_t taskmeta_index = 0; taskmeta_index < taskmeta_num;
-             ++taskmeta_num) {
+             ++taskmeta_index) {
           data_length +=
               outLodTensorVector[taskmeta_index][index].data.length();
           lod_length += outLodTensorVector[taskmeta_index][index].lod[0].size();
@@ -347,7 +380,7 @@ struct Task {
         size_t once_lod_length = 0;
         size_t last_lod_value = fetchVarTensor.lod[0][lod_length_offset];
         for (size_t taskmeta_index = 0; taskmeta_index < taskmeta_num;
-             ++taskmeta_num) {
+             ++taskmeta_index) {
           void* dst_ptr = fetchVarTensor.data.data() + data_length_offset;
           void* source_ptr =
               outLodTensorVector[taskmeta_index][index].data.data();
-- 
GitLab