short case statements on same line

Author: anujkaliaiitd

.clang-format

@@ -1 +1,2 @@
 BasedOnStyle: Google
+AllowShortCaseLabelsOnASingleLine: true

.ycm_extra_conf.py

@@ -44,7 +44,7 @@
     '-I' + str(home_dir) + '/eRPC/third_party',
     '-I' + str(home_dir) + '/eRPC/mica/src',
     '-I' + str(home_dir) + '/masstree-beta',
-    '-isystem' + str(homedir) + '/dpdk/x86_64-native-linuxapp-gcc/include',
+    '-isystem' + str(home_dir) + '/dpdk/x86_64-native-linuxapp-gcc/include',
     '-Wall',
     '-Werror',
     '-Wextra',

apps/smr/callbacks.h

@@ -36,7 +36,8 @@ static int __raft_applylog(raft_server_t *, void *udata, raft_entry_t *ety,
 
   size_t key_hash = mica::util::hash(&client_req->key, kAppKeySize);
   FixedTable *table = c->server.table;
-  FixedTable::ft_key_t *ft_key = reinterpret_cast<FixedTable::ft_key_t *>(client_req->key);
+  FixedTable::ft_key_t *ft_key =
+      reinterpret_cast<FixedTable::ft_key_t *>(client_req->key);
 
   auto result = table->set(key_hash, *ft_key,
                            reinterpret_cast<char *>(&client_req->value));

apps/smr/smr.h

@@ -68,14 +68,9 @@ struct client_req_t {
   std::string to_string() const {
     std::ostringstream ret;
     ret << "[Key (";
-    for (size_t k : key) {
-      ret << std::to_string(k) << " ";
-    }
-    ret << "), Value (";
-    for (size_t v : value) {
-      ret << std::to_string(v) << " ";
-    }
-    ret << ")]";
+    for (size_t k : key) ret << std::to_string(k) << "), ";
+    ret << "Value (";
+    for (size_t v : value) ret << std::to_string(v) << ")] ";
     return ret.str();
   }
 };
@@ -88,12 +83,10 @@ struct client_resp_t {
 
   std::string to_string() const {
     switch (resp_type) {
-      case ClientRespType::kSuccess:
-        return "success";
+      case ClientRespType::kSuccess: return "success";
       case ClientRespType::kFailRedirect:
         return "failed: redirect to node " + std::to_string(leader_node_id);
-      case ClientRespType::kFailTryAgain:
-        return "failed: try again";
+      case ClientRespType::kFailTryAgain: return "failed: try again";
     }
     return "Invalid";
   }

apps/smr/time_entry.h

@@ -28,24 +28,12 @@ class TimeEnt {
     std::string ret;
 
     switch (type) {
-      case TimeEntType::kClientReq:
-        ret = "client_req";
-        break;
-      case TimeEntType::kSendAeReq:
-        ret = "send_appendentries_req";
-        break;
-      case TimeEntType::kRecvAeReq:
-        ret = "recv_appendentries_req";
-        break;
-      case TimeEntType::kSendAeResp:
-        ret = "send_appendentries_resp";
-        break;
-      case TimeEntType::kRecvAeResp:
-        ret = "recv_appendentries_resp";
-        break;
-      case TimeEntType::kCommitted:
-        ret = "committed";
-        break;
+      case TimeEntType::kClientReq: ret = "client_req"; break;
+      case TimeEntType::kSendAeReq: ret = "send_appendentries_req"; break;
+      case TimeEntType::kRecvAeReq: ret = "recv_appendentries_req"; break;
+      case TimeEntType::kSendAeResp: ret = "send_appendentries_resp"; break;
+      case TimeEntType::kRecvAeResp: ret = "recv_appendentries_resp"; break;
+      case TimeEntType::kCommitted: ret = "committed"; break;
     }
 
     double usec = erpc::to_usec(tsc - base_tsc, freq_ghz);

src/pkthdr.h

@@ -34,14 +34,10 @@ enum PktType : uint64_t {
 
 static std::string pkt_type_str(uint64_t pkt_type) {
   switch (pkt_type) {
-    case kPktTypeReq:
-      return "REQ";
-    case kPktTypeRFR:
-      return "RFR";
-    case kPktTypeExplCR:
-      return "CR";
-    case kPktTypeResp:
-      return "RESP";
+    case kPktTypeReq: return "REQ";
+    case kPktTypeRFR: return "RFR";
+    case kPktTypeExplCR: return "CR";
+    case kPktTypeResp: return "RESP";
   }
 
   throw std::runtime_error("Invalid packet type.");

src/rpc_impl/rpc_pkt_loss.cc

@@ -40,8 +40,7 @@ void Rpc<TTr>::pkt_loss_scan_st() {
         if (ms_elapsed > kSMTimeoutMs) send_sm_req_st(session);
         break;
       }
-      default:
-        break;
+      default: break;
     }
   }
 }

src/rpc_impl/rpc_rx.cc

@@ -56,9 +56,7 @@ void Rpc<TTr>::process_comps_st() {
         process_resp_one_st(sslot, pkthdr, rx_tsc);
         break;
       }
-      case PktType::kPktTypeRFR:
-        process_rfr_st(sslot, pkthdr);
-        break;
+      case PktType::kPktTypeRFR: process_rfr_st(sslot, pkthdr); break;
       case PktType::kPktTypeExplCR: {
         size_t rx_tsc = kCcOptBatchTsc ? batch_rx_tsc : dpath_rdtsc();
         process_expl_cr_st(sslot, pkthdr, rx_tsc);

src/rpc_impl/rpc_sm_api.cc

@@ -137,8 +137,7 @@ int Rpc<TTr>::destroy_session_st(int session_num) {
       LOG_WARN("%s: None. Session reset in progress.\n", issue_msg);
       return 0;
 
-    default:
-      throw std::runtime_error("Invalid session state");
+    default: throw std::runtime_error("Invalid session state");
   }
 }
 

src/rpc_impl/rpc_sm_helpers.cc

@@ -14,20 +14,11 @@ void Rpc<TTr>::handle_sm_rx_st() {
   while (queue.size > 0) {
     const SmPkt sm_pkt = queue.unlocked_pop();  // Lock is held only briefly
     switch (sm_pkt.pkt_type) {
-      case SmPktType::kConnectReq:
-        handle_connect_req_st(sm_pkt);
-        break;
-      case SmPktType::kConnectResp:
-        handle_connect_resp_st(sm_pkt);
-        break;
-      case SmPktType::kDisconnectReq:
-        handle_disconnect_req_st(sm_pkt);
-        break;
-      case SmPktType::kDisconnectResp:
-        handle_disconnect_resp_st(sm_pkt);
-        break;
-      default:
-        throw std::runtime_error("Invalid packet type");
+      case SmPktType::kConnectReq: handle_connect_req_st(sm_pkt); break;
+      case SmPktType::kConnectResp: handle_connect_resp_st(sm_pkt); break;
+      case SmPktType::kDisconnectReq: handle_disconnect_req_st(sm_pkt); break;
+      case SmPktType::kDisconnectResp: handle_disconnect_resp_st(sm_pkt); break;
+      default: throw std::runtime_error("Invalid packet type");
     }
   }
 }