Fix #6: Changed coding style to match UFO Project

1 files changed, 166 insertions, 175 deletions

diff --git a/src/kiro-server.c b/src/kiro-server.c
index 15a8ccb..c69b6e7 100644
--- a/src/kiro-server.c
+++ b/src/kiro-server.c
@@ -65,265 +65,261 @@ struct _KiroServerPrivate {
 G_DEFINE_TYPE (KiroServer, kiro_server, G_TYPE_OBJECT);
 
 
-KiroServer*
-kiro_server_new (void) {
+KiroServer *
+kiro_server_new (void)
+{
     return g_object_new (KIRO_TYPE_SERVER, NULL);
 }
 
 
-static void kiro_server_init (KiroServer *self)
+static void
+kiro_server_init (KiroServer *self)
 {
-    KiroServerPrivate *priv = KIRO_SERVER_GET_PRIVATE(self);
-    memset(priv, 0, sizeof(&priv));
+    KiroServerPrivate *priv = KIRO_SERVER_GET_PRIVATE (self);
+    memset (priv, 0, sizeof (&priv));
 }
 
 
 static void
 kiro_server_finalize (GObject *object)
 {
-    KiroServer *self = KIRO_SERVER(object);
-    
+    KiroServer *self = KIRO_SERVER (object);
     //Clean up the server
-    kiro_server_stop(self);
+    kiro_server_stop (self);
 }
 
 
 static void
 kiro_server_class_init (KiroServerClass *klass)
 {
-    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
     gobject_class->finalize = kiro_server_finalize;
-    g_type_class_add_private(klass, sizeof(KiroServerPrivate));
+    g_type_class_add_private (klass, sizeof (KiroServerPrivate));
 }
 
 
-static int connect_client (struct rdma_cm_id *client)
+static int
+connect_client (struct rdma_cm_id *client)
 {
-    if(!client)
+    if (!client)
         return -1;
-        
-    if( -1 == kiro_attach_qp(client))
-    {
-        printf("Could not create a QP for the new connection.\n");
-        rdma_destroy_id(client);
+
+    if ( -1 == kiro_attach_qp (client)) {
+        printf ("Could not create a QP for the new connection.\n");
+        rdma_destroy_id (client);
         return -1;
     }
-    
-    struct kiro_connection_context *ctx = (struct kiro_connection_context *)calloc(1,sizeof(struct kiro_connection_context));
-    if(!ctx)
-    {
-        printf("Failed to create connection context.\n");
-        rdma_destroy_id(client);
+
+    struct kiro_connection_context *ctx = (struct kiro_connection_context *)calloc (1, sizeof (struct kiro_connection_context));
+
+    if (!ctx) {
+        printf ("Failed to create connection context.\n");
+        rdma_destroy_id (client);
         return -1;
     }
-    
-    ctx->cf_mr_send = (struct kiro_rdma_mem *)calloc(1, sizeof(struct kiro_rdma_mem));
-    ctx->cf_mr_recv = (struct kiro_rdma_mem *)calloc(1, sizeof(struct kiro_rdma_mem));
-    if(!ctx->cf_mr_recv || !ctx->cf_mr_send)
-    {
-        printf("Failed to allocate Control Flow Memory Container.\n");
+
+    ctx->cf_mr_send = (struct kiro_rdma_mem *)calloc (1, sizeof (struct kiro_rdma_mem));
+    ctx->cf_mr_recv = (struct kiro_rdma_mem *)calloc (1, sizeof (struct kiro_rdma_mem));
+
+    if (!ctx->cf_mr_recv || !ctx->cf_mr_send) {
+        printf ("Failed to allocate Control Flow Memory Container.\n");
         goto error;
     }
-    
-    ctx->cf_mr_recv = kiro_create_rdma_memory(client->pd, sizeof(struct kiro_ctrl_msg), IBV_ACCESS_LOCAL_WRITE);
-    ctx->cf_mr_send = kiro_create_rdma_memory(client->pd, sizeof(struct kiro_ctrl_msg), IBV_ACCESS_LOCAL_WRITE);
-    if(!ctx->cf_mr_recv || !ctx->cf_mr_send)
-    {
-        printf("Failed to register control message memory.\n");
+
+    ctx->cf_mr_recv = kiro_create_rdma_memory (client->pd, sizeof (struct kiro_ctrl_msg), IBV_ACCESS_LOCAL_WRITE);
+    ctx->cf_mr_send = kiro_create_rdma_memory (client->pd, sizeof (struct kiro_ctrl_msg), IBV_ACCESS_LOCAL_WRITE);
+
+    if (!ctx->cf_mr_recv || !ctx->cf_mr_send) {
+        printf ("Failed to register control message memory.\n");
         goto error;
     }
-    ctx->cf_mr_recv->size = ctx->cf_mr_send->size = sizeof(struct kiro_ctrl_msg);
+
+    ctx->cf_mr_recv->size = ctx->cf_mr_send->size = sizeof (struct kiro_ctrl_msg);
     client->context = ctx;
-    
-    if(rdma_post_recv(client, client, ctx->cf_mr_recv->mem, ctx->cf_mr_recv->size, ctx->cf_mr_recv->mr))
-    {
-        printf("Posting preemtive receive for connection failed.\n");
+
+    if (rdma_post_recv (client, client, ctx->cf_mr_recv->mem, ctx->cf_mr_recv->size, ctx->cf_mr_recv->mr)) {
+        printf ("Posting preemtive receive for connection failed.\n");
         goto error;
     }
-    
-    if(rdma_accept(client, NULL))
-    {
-        printf("Failed to establish connection to the client with error: %i.\n", errno);
+
+    if (rdma_accept (client, NULL)) {
+        printf ("Failed to establish connection to the client with error: %i.\n", errno);
         goto error;
     }
-    printf("Client Connected.\n");
-    return 0;
-
 
+    printf ("Client Connected.\n");
+    return 0;
 error:
-    rdma_reject(client, NULL, 0);
-    kiro_destroy_connection_context(&ctx);
-    rdma_destroy_id(client);
+    rdma_reject (client, NULL, 0);
+    kiro_destroy_connection_context (&ctx);
+    rdma_destroy_id (client);
     return -1;
 }
 
 
-static int welcome_client (struct rdma_cm_id *client, void *mem, size_t mem_size)
+static int
+welcome_client (struct rdma_cm_id *client, void *mem, size_t mem_size)
 {
-    struct kiro_connection_context *ctx = (struct kiro_connection_context *)(client->context);
-    ctx->rdma_mr = (struct kiro_rdma_mem *)calloc(1, sizeof(struct kiro_rdma_mem));
-    if(!ctx->rdma_mr)
-    {
-        printf("Failed to allocate RDMA Memory Container.\n");
+    struct kiro_connection_context *ctx = (struct kiro_connection_context *) (client->context);
+    ctx->rdma_mr = (struct kiro_rdma_mem *)calloc (1, sizeof (struct kiro_rdma_mem));
+
+    if (!ctx->rdma_mr) {
+        printf ("Failed to allocate RDMA Memory Container.\n");
         return -1;
     }
-    
+
     ctx->rdma_mr->mem = mem;
     ctx->rdma_mr->size = mem_size;
-    ctx->rdma_mr->mr = rdma_reg_read(client, ctx->rdma_mr->mem, ctx->rdma_mr->size);
-    if(!ctx->rdma_mr->mr)
-    {
-        printf("Failed to register RDMA Memory Region.\n");
-        kiro_destroy_rdma_memory(ctx->rdma_mr);
+    ctx->rdma_mr->mr = rdma_reg_read (client, ctx->rdma_mr->mem, ctx->rdma_mr->size);
+
+    if (!ctx->rdma_mr->mr) {
+        printf ("Failed to register RDMA Memory Region.\n");
+        kiro_destroy_rdma_memory (ctx->rdma_mr);
         return -1;
     }
-    
-    struct kiro_ctrl_msg *msg = (struct kiro_ctrl_msg *)(ctx->cf_mr_send->mem);
+
+    struct kiro_ctrl_msg *msg = (struct kiro_ctrl_msg *) (ctx->cf_mr_send->mem);
+
     msg->msg_type = KIRO_ACK_RDMA;
-    msg->peer_mri = *(ctx->rdma_mr->mr);
-    
-    if(rdma_post_send(client, client, ctx->cf_mr_send->mem, ctx->cf_mr_send->size, ctx->cf_mr_send->mr, IBV_SEND_SIGNALED))
-    {
-        printf("Failure while trying to post SEND.\n");
-        kiro_destroy_rdma_memory(ctx->rdma_mr);
+
+    msg->peer_mri = * (ctx->rdma_mr->mr);
+
+    if (rdma_post_send (client, client, ctx->cf_mr_send->mem, ctx->cf_mr_send->size, ctx->cf_mr_send->mr, IBV_SEND_SIGNALED)) {
+        printf ("Failure while trying to post SEND.\n");
+        kiro_destroy_rdma_memory (ctx->rdma_mr);
         return -1;
     }
-    
+
     struct ibv_wc wc;
-    
-    if(rdma_get_send_comp(client, &wc) < 0)
-    {
-        printf("Failed to post RDMA MRI to client.\n");
-        kiro_destroy_rdma_memory(ctx->rdma_mr);
+
+    if (rdma_get_send_comp (client, &wc) < 0) {
+        printf ("Failed to post RDMA MRI to client.\n");
+        kiro_destroy_rdma_memory (ctx->rdma_mr);
         return -1;
     }
-    printf("RDMA MRI sent to client.\n");
 
+    printf ("RDMA MRI sent to client.\n");
     return 0;
 }
 
 
-void * event_loop (void *self)
+void *
+event_loop (void *self)
 {
-    KiroServerPrivate *priv = KIRO_SERVER_GET_PRIVATE((KiroServer *)self);
+    KiroServerPrivate *priv = KIRO_SERVER_GET_PRIVATE ((KiroServer *)self);
     struct rdma_cm_event *active_event;
 
-    while(0 == priv->close_signal) {
-        if(0 <= rdma_get_cm_event(priv->ec, &active_event))
-        {
+    while (0 == priv->close_signal) {
+        if (0 <= rdma_get_cm_event (priv->ec, &active_event)) {
             //Disable cancellation to prevent undefined states during shutdown
-            pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-                        
-            struct rdma_cm_event *ev = malloc(sizeof(*active_event));
-            if(!ev)
-            {
-                printf("Unable to allocate memory for Event handling!\n");
-                rdma_ack_cm_event(active_event); 
+            pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL);
+            struct rdma_cm_event *ev = malloc (sizeof (*active_event));
+
+            if (!ev) {
+                printf ("Unable to allocate memory for Event handling!\n");
+                rdma_ack_cm_event (active_event);
                 continue;
             }
-            memcpy(ev, active_event, sizeof(*active_event));
-            rdma_ack_cm_event(active_event);            
-            
-            if (ev->event == RDMA_CM_EVENT_CONNECT_REQUEST)
-            {
-                
-                if (0 != priv->close_signal)
-                {
+
+            memcpy (ev, active_event, sizeof (*active_event));
+            rdma_ack_cm_event (active_event);
+
+            if (ev->event == RDMA_CM_EVENT_CONNECT_REQUEST) {
+                if (0 != priv->close_signal) {
                     //Main thread has signalled shutdown!
-                    //Don't connect this client any more
+                    //Don't connect this client any more.
                     //Sorry mate!
-                    rdma_reject(ev->id, NULL, 0);
+                    rdma_reject (ev->id, NULL, 0);
                 }
-                
-                if(0 == connect_client(ev->id)) {
+
+                if (0 == connect_client (ev->id)) {
                     // Post a welcoming "Recieve" for handshaking
-                    if (0 == welcome_client(ev->id, priv->mem, priv->mem_size)) {
+                    if (0 == welcome_client (ev->id, priv->mem, priv->mem_size)) {
                         // Connection set-up successfully! (Server)
-                        struct kiro_connection_context *ctx = (struct kiro_connection_context *)(ev->id->context);
+                        struct kiro_connection_context *ctx = (struct kiro_connection_context *) (ev->id->context);
                         ctx->identifier = priv->next_client_id++;
                         priv->clients = g_list_append (priv->clients, (gpointer)ev->id);
-                        printf("Client id %u connected\n", ctx->identifier);
-                        printf("Currently %u clients in total are connected.\n", g_list_length (priv->clients));
+                        printf ("Client id %u connected\n", ctx->identifier);
+                        printf ("Currently %u clients in total are connected.\n", g_list_length (priv->clients));
                     }
                 }
             }
-            else if(ev->event == RDMA_CM_EVENT_DISCONNECTED)
-            {
+            else if (ev->event == RDMA_CM_EVENT_DISCONNECTED) {
                 GList *client = g_list_find (priv->clients, (gconstpointer) ev->id);
+
                 if (client) {
-                    struct kiro_connection_context *ctx = (struct kiro_connection_context *)(ev->id->context);
+                    struct kiro_connection_context *ctx = (struct kiro_connection_context *) (ev->id->context);
                     printf ("Got disconnect request from client %u.\n", ctx->identifier);
                     priv->clients = g_list_delete_link (priv->clients, client);
                 }
                 else
-                    printf("Got disconnect request from unknown client.\n");
+                    printf ("Got disconnect request from unknown client.\n");
 
-                kiro_destroy_connection(&(ev->id));
-                printf("Connection closed successfully. %u connected clients remaining.\n", g_list_length (priv->clients));
-            }            
-            free(ev);
+                kiro_destroy_connection (& (ev->id));
+                printf ("Connection closed successfully. %u connected clients remaining.\n", g_list_length (priv->clients));
+            }
+
+            free (ev);
         }
-        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+
+        pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL);
     }
 
-    printf("Closing Event Listener Thread\n");
+    printf ("Closing Event Listener Thread\n");
     return NULL;
 }
 
 
 
 
-int kiro_server_start (KiroServer *self, char *address, char *port, void* mem, size_t mem_size)
+int
+kiro_server_start (KiroServer *self, char *address, char *port, void *mem, size_t mem_size)
 {
-    KiroServerPrivate *priv = KIRO_SERVER_GET_PRIVATE(self);
+    KiroServerPrivate *priv = KIRO_SERVER_GET_PRIVATE (self);
 
-    if(priv->base)
-    {
-        printf("Server already started.\n");
+    if (priv->base) {
+        printf ("Server already started.\n");
         return -1;
     }
-    
-    if(!mem || mem_size == 0)
-    {
-        printf("Invalid memory given to provide.\n");
+
+    if (!mem || mem_size == 0) {
+        printf ("Invalid memory given to provide.\n");
         return -1;
     }
-    
+
     struct rdma_addrinfo hints, *res_addrinfo;
-    memset(&hints, 0, sizeof(hints));
+    memset (&hints, 0, sizeof (hints));
     hints.ai_port_space = RDMA_PS_IB;
     hints.ai_flags = RAI_PASSIVE;
-    if(rdma_getaddrinfo(address, port, &hints, &res_addrinfo))
-    {
-        printf("Failed to create address information.");
+
+    if (rdma_getaddrinfo (address, port, &hints, &res_addrinfo)) {
+        printf ("Failed to create address information.");
         return -1;
     }
-    
+
     struct ibv_qp_init_attr qp_attr;
-    memset(&qp_attr, 0, sizeof(qp_attr));
+    memset (&qp_attr, 0, sizeof (qp_attr));
     qp_attr.cap.max_send_wr = 10;
     qp_attr.cap.max_recv_wr = 10;
     qp_attr.cap.max_send_sge = 1;
     qp_attr.cap.max_recv_sge = 1;
     qp_attr.qp_context = priv->base;
     qp_attr.sq_sig_all = 1;
-    
-    if(rdma_create_ep(&(priv->base), res_addrinfo, NULL, &qp_attr))
-    {
-        printf("Endpoint creation failed: %s.\n", strerror (errno));
+
+    if (rdma_create_ep (& (priv->base), res_addrinfo, NULL, &qp_attr)) {
+        printf ("Endpoint creation failed: %s.\n", strerror (errno));
         return -1;
     }
-    printf("Endpoint created.\n");
-    
+
+    printf ("Endpoint created.\n");
     char *addr_local = NULL;
-    struct sockaddr* src_addr = rdma_get_local_addr(priv->base);
-    if(!src_addr)
-    {
+    struct sockaddr *src_addr = rdma_get_local_addr (priv->base);
+
+    if (!src_addr) {
         addr_local = "NONE";
     }
-    else
-    {
-        addr_local = inet_ntoa(((struct sockaddr_in *)src_addr)->sin_addr);
+    else {
+        addr_local = inet_ntoa (((struct sockaddr_in *)src_addr)->sin_addr);
         /*
         if(src_addr->sa_family == AF_INET)
             addr_local = &(((struct sockaddr_in*)src_addr)->sin_addr);
@@ -331,32 +327,28 @@ int kiro_server_start (KiroServer *self, char *address, char *port, void* mem, s
             addr_local = &(((struct sockaddr_in6*)src_addr)->sin6_addr);
         */
     }
-    
-    printf("Bound to address %s:%s\n",addr_local, port);
-    
-    if(rdma_listen(priv->base, 0))
-    {
-        printf("Failed to put server into listening state.\n");
-        rdma_destroy_ep(priv->base);
+
+    printf ("Bound to address %s:%s\n", addr_local, port);
+
+    if (rdma_listen (priv->base, 0)) {
+        printf ("Failed to put server into listening state.\n");
+        rdma_destroy_ep (priv->base);
         return -1;
     }
-    
+
     priv->mem = mem;
     priv->mem_size = mem_size;
+    priv->ec = rdma_create_event_channel();
 
-    priv->ec = rdma_create_event_channel();   
-    if(rdma_migrate_id(priv->base, priv->ec))
-    {
-        printf("Was unable to migrate connection to new Event Channel.\n");
-        rdma_destroy_ep(priv->base);
+    if (rdma_migrate_id (priv->base, priv->ec)) {
+        printf ("Was unable to migrate connection to new Event Channel.\n");
+        rdma_destroy_ep (priv->base);
         return -1;
     }
 
-    pthread_create(&(priv->event_listener), NULL, event_loop, self);
-
-    printf("Enpoint listening.\n");
-    
-    sleep(1);
+    pthread_create (& (priv->event_listener), NULL, event_loop, self);
+    printf ("Enpoint listening.\n");
+    sleep (1);
     return 0;
 }
 
@@ -366,7 +358,7 @@ disconnect_client (gpointer data, gpointer user_data)
 {
     if (data) {
         struct rdma_cm_id *id = (struct rdma_cm_id *)data;
-        struct kiro_connection_context *ctx = (struct kiro_connection_context *)(id->context);
+        struct kiro_connection_context *ctx = (struct kiro_connection_context *) (id->context);
         printf ("Disconnecting client: %u.\n", ctx->identifier);
         rdma_disconnect ((struct rdma_cm_id *) data);
     }
@@ -376,30 +368,29 @@ disconnect_client (gpointer data, gpointer user_data)
 void
 kiro_server_stop (KiroServer *self)
 {
-    if(!self)
+    if (!self)
         return;
-        
+
     KiroServerPrivate *priv = KIRO_SERVER_GET_PRIVATE (self);
-    
-    if(!priv->base)
+
+    if (!priv->base)
         return;
-    
+
     //Shut down the listener-thread
     priv->close_signal = 1;
-    pthread_cancel(priv->event_listener);
-    pthread_join(priv->event_listener, NULL);
-    printf("Event Listener Thread stopped.\n");
+    pthread_cancel (priv->event_listener);
+    pthread_join (priv->event_listener, NULL);
+    printf ("Event Listener Thread stopped.\n");
     priv->close_signal = 0;
     
     g_list_foreach (priv->clients, disconnect_client, NULL);
     g_list_free (priv->clients);
-     
-    rdma_destroy_ep(priv->base);
+    
+    rdma_destroy_ep (priv->base);
     priv->base = NULL;
-    rdma_destroy_event_channel(priv->ec);
+    rdma_destroy_event_channel (priv->ec);
     priv->ec = NULL;
-    
-    printf("Server stopped successfully.\n");
+    printf ("Server stopped successfully.\n");
 }