Update field order.

Author: Barath Raghavan

core/module.h

@@ -21,9 +21,9 @@ using bess::gate_idx_t;
 #define UNCONSTRAINED_SOCKET ((0x1ull << MAX_NUMA_NODE) - 1)
 
 struct task_result {
+  bool block;
   uint32_t packets;
   uint64_t bits;
-  bool block;
 };
 
 typedef uint16_t task_id_t;

core/module_bench.cc

@@ -33,7 +33,7 @@ class DummySourceModule : public Module {
 
   RunNextModule(&batch);
 
-  return { .packets = batch_size, .bits = 0, .block = false };
+  return { .block = false, .packets = batch_size, .bits = 0 };
 }
 
 class DummyRelayModule : public Module {

core/modules/drr.cc

@@ -131,7 +131,7 @@ struct task_result DRR::RunTask(void*) {
   // the number of bits inserted into the packet batch
   uint32_t cnt = batch.cnt();
   uint64_t bits_retrieved = (total_bytes + cnt * kPacketOverhead) * 8;
-  return { .packets = cnt, .bits = bits_retrieved, .block = (cnt == 0) };
+  return { .block = (cnt == 0), .packets = cnt, .bits = bits_retrieved };
 }
 
 uint32_t DRR::GetNextBatch(bess::PacketBatch* batch, int* err) {

core/modules/flowgen.cc

@@ -487,9 +487,9 @@ struct task_result FlowGen::RunTask(void *) {
 
   uint32_t cnt = batch.cnt();
   return {
+    .block = (cnt == 0),
     .packets = cnt,
-    .bits = ((template_size_ + pkt_overhead) * cnt) * 8,
-    .block = (cnt == 0)
+    .bits = ((template_size_ + pkt_overhead) * cnt) * 8
   };
 }
 

core/modules/noop.cc

@@ -11,7 +11,7 @@ CommandResponse NoOP::Init(const bess::pb::EmptyArg &) {
 }
 
 struct task_result NoOP::RunTask(void *) {
-  return { .packets = 0, .bits = 0, .block = false };
+  return { .block = false, .packets = 0, .bits = 0 };
 }
 
 ADD_MODULE(NoOP, "noop", "creates a task that does nothing")

core/modules/port_inc.cc

@@ -83,7 +83,7 @@ struct task_result PortInc::RunTask(void *arg) {
   batch.set_cnt(p->RecvPackets(qid, batch.pkts(), burst));
   uint32_t cnt = batch.cnt();
   if (cnt == 0) {
-    return { .packets = 0, .bits = 0, .block = true };
+    return { .block = true, .packets = 0, .bits = 0 };
   }
 
   // NOTE: we cannot skip this step since it might be used by scheduler.
@@ -106,9 +106,9 @@ struct task_result PortInc::RunTask(void *arg) {
   RunNextModule(&batch);
 
   return {
+    .block = false,
     .packets = cnt,
-    .bits = (received_bytes + cnt * pkt_overhead) * 8,
-    .block = false
+    .bits = (received_bytes + cnt * pkt_overhead) * 8
   };
 }
 

core/modules/queue.cc

@@ -119,7 +119,7 @@ struct task_result Queue::RunTask(void *) {
   uint32_t cnt = llring_sc_dequeue_burst(queue_, (void **)batch.pkts(), burst);
 
   if (cnt == 0) {
-    return { .packets = 0, .bits = 0, .block = true };
+    return { .block = true, .packets = 0, .bits = 0 };
   }
 
   batch.set_cnt(cnt);
@@ -137,9 +137,9 @@ struct task_result Queue::RunTask(void *) {
   }
 
   return {
+    .block = false,
     .packets = cnt,
-    .bits = (total_bytes + cnt * pkt_overhead) * 8,
-    .block = false
+    .bits = (total_bytes + cnt * pkt_overhead) * 8
   };
 }
 

core/modules/queue_inc.cc

@@ -70,7 +70,7 @@ struct task_result QueueInc::RunTask(void *arg) {
   uint32_t cnt = batch.cnt();
 
   if (cnt == 0) {
-    return { .packets = 0, .bits = 0, .block = true };
+    return { .block = true, .packets = 0, .bits = 0 };
   }
 
   // NOTE: we cannot skip this step since it might be used by scheduler.
@@ -93,9 +93,9 @@ struct task_result QueueInc::RunTask(void *arg) {
   RunNextModule(&batch);
 
   return {
+    .block = false,
     .packets = cnt,
-    .bits = (received_bytes + cnt * pkt_overhead) * 8,
-    .block = false
+    .bits = (received_bytes + cnt * pkt_overhead) * 8
   };
 }
 

core/modules/source.cc

@@ -63,9 +63,9 @@ struct task_result Source::RunTask(void *) {
   RunNextModule(&batch);  // it's fine to call this function with cnt==0
 
   return {
+    .block = (cnt == 0),
     .packets = cnt,
-    .bits = (pkt_size + pkt_overhead) * cnt * 8,
-    .block = (cnt == 0)
+    .bits = (pkt_size + pkt_overhead) * cnt * 8
   };
 }
 

core/traffic_class_bench.cc

@@ -25,7 +25,7 @@ class DummyModule : public Module {
 
 [[gnu::noinline]] struct task_result DummyModule::RunTask(
     [[maybe_unused]] void *arg) {
-  return { .packets = 0, .bits = 0, .block = false };
+  return { .block = false, .packets = 0, .bits = 0 };
 }
 
 // Performs TC Scheduler init/deinit before/after each test.