fix code format

Author: chencjcj

flagcx/adaptor/include/ib_common.h

@@ -10,8 +10,8 @@
 #define FLAGCX_IB_COMMON_H_
 
 #include "flagcx_net.h"
-#include "net.h"
 #include "ibvcore.h"
+#include "net.h"
 #include <pthread.h>
 #include <stdint.h>
 
@@ -57,7 +57,6 @@ struct flagcxIbStats {
   int fatalErrorCount;
 };
 
-
 struct flagcxIbDev {
   pthread_mutex_t lock;
   int device;
@@ -274,7 +273,6 @@ extern pthread_mutex_t flagcxIbLock;
 extern int flagcxIbRelaxedOrderingEnabled;
 extern pthread_t flagcxIbAsyncThread;
 
-
 // Parameter functions
 extern int64_t flagcxParamIbGidIndex(void);
 extern int64_t flagcxParamIbRoceVersionNum(void);
@@ -295,14 +293,24 @@ extern int64_t flagcxParamIbQpsPerConn(void);
 extern sa_family_t envIbAddrFamily(void);
 extern void *envIbAddrRange(sa_family_t af, int *mask);
 extern sa_family_t getGidAddrFamily(union ibv_gid *gid);
-extern bool matchGidAddrPrefix(sa_family_t af, void *prefix, int prefixlen, union ibv_gid *gid);
+extern bool matchGidAddrPrefix(sa_family_t af, void *prefix, int prefixlen,
+                               union ibv_gid *gid);
 extern bool configuredGid(union ibv_gid *gid);
 extern bool linkLocalGid(union ibv_gid *gid);
 extern bool validGid(union ibv_gid *gid);
-extern flagcxResult_t flagcxIbRoceGetVersionNum(const char *deviceName, int portNum, int gidIndex, int *version);
-extern flagcxResult_t flagcxUpdateGidIndex(struct ibv_context *context, uint8_t portNum, sa_family_t af, void *prefix, int prefixlen, int roceVer, int gidIndexCandidate, int *gidIndex);
-extern flagcxResult_t flagcxIbGetGidIndex(struct ibv_context *context, uint8_t portNum, int gidTblLen, int *gidIndex);
-extern flagcxResult_t flagcxIbGetPciPath(char *devName, char **path, int *realPort);
+extern flagcxResult_t flagcxIbRoceGetVersionNum(const char *deviceName,
+                                                int portNum, int gidIndex,
+                                                int *version);
+extern flagcxResult_t flagcxUpdateGidIndex(struct ibv_context *context,
+                                           uint8_t portNum, sa_family_t af,
+                                           void *prefix, int prefixlen,
+                                           int roceVer, int gidIndexCandidate,
+                                           int *gidIndex);
+extern flagcxResult_t flagcxIbGetGidIndex(struct ibv_context *context,
+                                          uint8_t portNum, int gidTblLen,
+                                          int *gidIndex);
+extern flagcxResult_t flagcxIbGetPciPath(char *devName, char **path,
+                                         int *realPort);
 extern int flagcxIbWidth(int width);
 extern int flagcxIbSpeed(int speed);
 extern int flagcxIbRelaxedOrderingCapable(void);
@@ -319,7 +327,6 @@ extern flagcxResult_t flagcxIbGdrSupport(void);
 extern flagcxResult_t flagcxIbDmaBufSupport(int dev);
 extern flagcxResult_t flagcxIbFreeRequest(struct flagcxIbRequest *r);
 
-
 static_assert((sizeof(struct flagcxIbNetCommBase) % 32) == 0,
               "flagcxIbNetCommBase size must be 32-byte multiple to ensure "
               "fifo is at proper offset");
@@ -333,9 +340,9 @@ static_assert((offsetof(struct flagcxIbSendComm, wrs) % 32) == 0,
               "wrs must be 32-byte aligned");
 static_assert((offsetof(struct flagcxIbRecvComm, remFifo) % 32) == 0,
               "flagcxIbRecvComm fifo must be 32-byte aligned");
-static_assert(sizeof(struct flagcxIbHandle) < FLAGCX_NET_HANDLE_MAXSIZE,
-              "flagcxIbHandle size must be smaller than FLAGCX_NET_HANDLE_MAXSIZE");
-
+static_assert(
+    sizeof(struct flagcxIbHandle) < FLAGCX_NET_HANDLE_MAXSIZE,
+    "flagcxIbHandle size must be smaller than FLAGCX_NET_HANDLE_MAXSIZE");
 
 static_assert(MAX_REQUESTS <= 256, "request id are encoded in wr_id and we "
                                    "need up to 8 requests ids per completion");

flagcx/adaptor/include/ucx_adaptor.h

@@ -12,8 +12,8 @@
 #ifdef USE_UCX
 
 #include "check.h"
-#include "socket.h"
 #include "ib_common.h"
+#include "socket.h"
 #include <pthread.h>
 #include <ucp/api/ucp.h>
 

flagcx/adaptor/net/ibrc_adaptor.cc

@@ -8,25 +8,24 @@
 #include "core.h"
 #include "flagcx_common.h"
 #include "flagcx_net.h"
+#include "ib_common.h"
 #include "ibvwrap.h"
+#include "net.h"
 #include "param.h"
 #include "socket.h"
+#include "timer.h"
 #include "utils.h"
-#include "ib_common.h"
 #include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <poll.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include "ib_common.h"
-#include "net.h"
-#include "timer.h"
 
 char flagcxIbIfName[MAX_IF_NAME_SIZE + 1];
 union flagcxSocketAddress flagcxIbIfAddr;
@@ -56,7 +55,6 @@ struct flagcxIbDev flagcxIbDevs[MAX_IB_DEVS];
 pthread_mutex_t flagcxIbLock = PTHREAD_MUTEX_INITIALIZER;
 int flagcxIbRelaxedOrderingEnabled = 0;
 
-
 pthread_t flagcxIbAsyncThread;
 void *flagcxIbAsyncThreadMain(void *args) {
   struct flagcxIbDev *dev = (struct flagcxIbDev *)args;
@@ -217,9 +215,8 @@ bool validGid(union ibv_gid *gid) {
   return (configuredGid(gid) && !linkLocalGid(gid));
 }
 
-flagcxResult_t flagcxIbRoceGetVersionNum(const char *deviceName,
-                                         int portNum, int gidIndex,
-                                         int *version) {
+flagcxResult_t flagcxIbRoceGetVersionNum(const char *deviceName, int portNum,
+                                         int gidIndex, int *version) {
   char gidRoceVerStr[16] = {0};
   char roceTypePath[PATH_MAX] = {0};
   sprintf(roceTypePath, "/sys/class/infiniband/%s/ports/%d/gid_attrs/types/%d",
@@ -250,9 +247,8 @@ flagcxResult_t flagcxIbRoceGetVersionNum(const char *deviceName,
 
 flagcxResult_t flagcxUpdateGidIndex(struct ibv_context *context,
                                     uint8_t portNum, sa_family_t af,
-                                    void *prefix, int prefixlen,
-                                    int roceVer, int gidIndexCandidate,
-                                    int *gidIndex) {
+                                    void *prefix, int prefixlen, int roceVer,
+                                    int gidIndexCandidate, int *gidIndex) {
   union ibv_gid gid, gidCandidate;
   FLAGCXCHECK(flagcxWrapIbvQueryGid(context, portNum, *gidIndex, &gid));
   FLAGCXCHECK(flagcxWrapIbvQueryGid(context, portNum, gidIndexCandidate,
@@ -288,9 +284,8 @@ flagcxResult_t flagcxUpdateGidIndex(struct ibv_context *context,
   return flagcxSuccess;
 }
 
-flagcxResult_t flagcxIbGetGidIndex(struct ibv_context *context,
-                                   uint8_t portNum, int gidTblLen,
-                                   int *gidIndex) {
+flagcxResult_t flagcxIbGetGidIndex(struct ibv_context *context, uint8_t portNum,
+                                   int gidTblLen, int *gidIndex) {
   *gidIndex = flagcxParamIbGidIndex();
   if (*gidIndex >= 0) {
     return flagcxSuccess;
@@ -311,9 +306,7 @@ flagcxResult_t flagcxIbGetGidIndex(struct ibv_context *context,
   return flagcxSuccess;
 }
 
-
-flagcxResult_t flagcxIbGetPciPath(char *devName, char **path,
-                                  int *realPort) {
+flagcxResult_t flagcxIbGetPciPath(char *devName, char **path, int *realPort) {
   char devicePath[PATH_MAX];
   snprintf(devicePath, PATH_MAX, "/sys/class/infiniband/%s/device", devName);
   char *p = realpath(devicePath, NULL);
@@ -610,7 +603,6 @@ flagcxResult_t flagcxIbInit() {
 
 const char *reqTypeStr[] = {"Unused", "Send", "Recv", "Flush"};
 
-
 static void flagcxIbAddEvent(struct flagcxIbRequest *req, int devIndex,
                              struct flagcxIbNetCommDevBase *base) {
   req->events[devIndex]++;