refs #17: Apply the API changes to the offloading path as well.

ANLAB-KAIST · Aug 9, 2015 · bf6c9b2 · bf6c9b2
1 parent c4135d1
commit bf6c9b2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/datablock.cc b/lib/datablock.cc
@@ -275,7 +275,9 @@ void DataBlock::postprocess(OffloadableElement *elem, int input_port, PacketBatc
                        (char*) host_out_ptr + offset,
                        elemsz);
             Packet *pkt = Packet::from_base(batch->packets[p]);
-            batch->results[p] = elem->postproc(input_port, nullptr, pkt);
+            pkt->output = -1;
+            elem->postproc(input_port, nullptr, pkt);
+            batch->results[p] = pkt->output;
             batch->excluded[p] = (batch->results[p] == DROP);
         }
         batch->has_results = true;
@@ -290,12 +292,12 @@ void DataBlock::postprocess(OffloadableElement *elem, int input_port, PacketBatc
         /* Run postporcessing only. */
         for (unsigned p = 0; p < batch->count; p++) {
             if (batch->excluded[p]) continue;
-            unsigned elemsz = t->aligned_item_sizes.size;
-            unsigned offset = elemsz * p;
+            uintptr_t elemsz = t->aligned_item_sizes.size;
+            uintptr_t offset = elemsz * p;
             Packet *pkt = Packet::from_base(batch->packets[p]);
-            batch->results[p] = elem->postproc(input_port,
-                                               (char*) host_out_ptr + offset,
-                                               pkt);
+            pkt->output = -1;
+            elem->postproc(input_port, (char*) host_out_ptr + offset, pkt);
+            batch->results[p] = pkt->output;
             batch->excluded[p] = (batch->results[p] == DROP);
         }
         batch->has_results = true;

diff --git a/lib/packet.hh b/lib/packet.hh
@@ -41,6 +41,7 @@ private:
     int output;
 
     friend class Element;
+    friend class DataBlock;
 
 public:
     struct annotation_set anno;