Changeset 24ab58b3 in mainline for uspace/srv/net/nil/nildummy

Timestamp:

2010-04-06T11:41:48Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

14f1db0

Parents:

4dd8529

Message:

more compact network startup messages (usually one line instead of multiple lines)
pass module name as an argument to nil_message() and friends
deeper cstyle changes (replace forward prototypes with proper extern declarations and static functions, change doxygen comments, stick more closely to the 80-column rule, no argument names in header files, spacing, comments, etc.)

Location:

uspace/srv/net/nil/nildummy

Files:

• nildummy.c (modified) (8 diffs)
• nildummy_module.c (modified) (1 diff)

uspace/srv/net/nil/nildummy/nildummy.c

@@ -60 +60 @@
 /** The module name.
  */
-#define NAME    "Dummy nil protocol"
+#define NAME  "nildummy"
 
 /** Default maximum transmission unit.
@@ -228 +228 @@
                         return index;
                 }
-                printf("New device registered:\n\tid\t= %d\n\tservice\t= %d\n\tMTU\t= %d\n", device->device_id, device->service, device->mtu);
+                printf("%s: Device registered (id: %d, service: %d, mtu: %d)\n",
+                    NAME, device->device_id, device->service, device->mtu);
         }
         fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
@@ -290 +291 @@
         nildummy_globals.proto.service = service;
         nildummy_globals.proto.phone = phone;
-        printf("New protocol registered:\n\tservice\t= %d\n\tphone\t= %d\n", nildummy_globals.proto.service, nildummy_globals.proto.phone);
+        
+        printf("%s: Protocol registered (service: %d, phone: %d)\n",
+            NAME, nildummy_globals.proto.service, nildummy_globals.proto.phone);
+        
         fibril_rwlock_write_unlock(&nildummy_globals.protos_lock);
         return EOK;
@@ -312 +316 @@
 }
 
-int nil_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int nil_message(const char *name, ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, int *answer_count)
+{
         ERROR_DECLARE;
-
+        
         measured_string_ref address;
         packet_t packet;
@@ -321 +327 @@
         size_t suffix;
         size_t content;
-
-//      printf("message %d - %d\n", IPC_GET_METHOD(*call), NET_NIL_FIRST);
+        
         *answer_count = 0;
-        switch(IPC_GET_METHOD(*call)){
+        switch (IPC_GET_METHOD(*call)) {
                 case IPC_M_PHONE_HUNGUP:
                         return EOK;
                 case NET_NIL_DEVICE:
-                        return nildummy_device_message(IPC_GET_DEVICE(call), IPC_GET_SERVICE(call), IPC_GET_MTU(call));
+                        return nildummy_device_message(IPC_GET_DEVICE(call),
+                            IPC_GET_SERVICE(call), IPC_GET_MTU(call));
                 case NET_NIL_SEND:
-                        ERROR_PROPAGATE(packet_translate(nildummy_globals.net_phone, &packet, IPC_GET_PACKET(call)));
-                        return nildummy_send_message(IPC_GET_DEVICE(call), packet, IPC_GET_SERVICE(call));
+                        ERROR_PROPAGATE(packet_translate(nildummy_globals.net_phone,
+                            &packet, IPC_GET_PACKET(call)));
+                        return nildummy_send_message(IPC_GET_DEVICE(call), packet,
+                            IPC_GET_SERVICE(call));
                 case NET_NIL_PACKET_SPACE:
-                        ERROR_PROPAGATE(nildummy_packet_space_message(IPC_GET_DEVICE(call), &addrlen, &prefix, &content, &suffix));
+                        ERROR_PROPAGATE(nildummy_packet_space_message(IPC_GET_DEVICE(call),
+                            &addrlen, &prefix, &content, &suffix));
                         IPC_SET_ADDR(answer, addrlen);
                         IPC_SET_PREFIX(answer, prefix);
@@ -341 +350 @@
                         return EOK;
                 case NET_NIL_ADDR:
-                        ERROR_PROPAGATE(nildummy_addr_message(IPC_GET_DEVICE(call), &address));
+                        ERROR_PROPAGATE(nildummy_addr_message(IPC_GET_DEVICE(call),
+                            &address));
                         return measured_strings_reply(address, 1);
                 case IPC_M_CONNECT_TO_ME:
-                        return nildummy_register_message(NIL_GET_PROTO(call), IPC_GET_PHONE(call));
-        }
+                        return nildummy_register_message(NIL_GET_PROTO(call),
+                            IPC_GET_PHONE(call));
+        }
+        
         return ENOTSUP;
 }
@@ -404 +416 @@
                 
                 /* Process the message */
-                int res = nil_module_message(callid, &call, &answer, &answer_count);
+                int res = nil_module_message(NAME, callid, &call, &answer,
+                    &answer_count);
                 
                 /* End if said to either by the message or the processing result */
@@ -428 +441 @@
         ERROR_DECLARE;
         
-        /* Print the module label */
-        printf("Task %d - %s\n", task_get_id(), NAME);
-        
         /* Start the module */
-        if (ERROR_OCCURRED(nil_module_start(nil_client_connection))) {
-                printf(" - ERROR %i\n", ERROR_CODE);
+        if (ERROR_OCCURRED(nil_module_start(nil_client_connection)))
                 return ERROR_CODE;
-        }
         
         return EOK;

uspace/srv/net/nil/nildummy/nildummy_module.c

@@ -51 +51 @@
 #include "nildummy.h"
 
-/** Starts the dummy nil module.
- *  Initializes the client connection serving function, initializes the module, registers the module service and starts the async manager, processing IPC messages in an infinite loop.
- *  @param[in] client_connection The client connection processing function. The module skeleton propagates its own one.
- *  @returns EOK on success.
- *  @returns Other error codes as defined for the pm_init() function.
- *  @returns Other error codes as defined for the nil_initialize() function.
- *  @returns Other error codes as defined for the REGISTER_ME() macro function.
+/** Start the dummy nil module.
+ *
+ * Initialize the client connection serving function, initialize
+ * the module, register the module service and start the async
+ * manager, processing IPC messages in an infinite loop.
+ *
+ * @param[in] client_connection The client connection processing
+ *                              function. The module skeleton propagates
+ *                              its own one.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for the pm_init() function.
+ * @return Other error codes as defined for the nil_initialize() function.
+ * @return Other error codes as defined for the REGISTER_ME() macro function.
+ *
  */
-int nil_module_start(async_client_conn_t client_connection){
+int nil_module_start(async_client_conn_t client_connection)
+{
         ERROR_DECLARE;
-
+        
+        async_set_client_connection(client_connection);
+        int net_phone = net_connect_module(SERVICE_NETWORKING);
+        ERROR_PROPAGATE(pm_init());
+        
         ipcarg_t phonehash;
-        int net_phone;
-
-        async_set_client_connection(client_connection);
-        net_phone = net_connect_module(SERVICE_NETWORKING);
-        ERROR_PROPAGATE(pm_init());
-        if(ERROR_OCCURRED(nil_initialize(net_phone))
-                || ERROR_OCCURRED(REGISTER_ME(SERVICE_NILDUMMY, &phonehash))){
+        if (ERROR_OCCURRED(nil_initialize(net_phone))
+            || ERROR_OCCURRED(REGISTER_ME(SERVICE_NILDUMMY, &phonehash))){
                 pm_destroy();
                 return ERROR_CODE;
         }
-
+        
         async_manager();
-
+        
         pm_destroy();
         return EOK;
 }
 
-/** Passes the parameters to the module specific nil_message() function.
- *  @param[in] callid The message identifier.
- *  @param[in] call The message parameters.
- *  @param[out] answer The message answer parameters.
- *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
- *  @returns EOK on success.
- *  @returns ENOTSUP if the message is not known.
- *  @returns Other error codes as defined for each specific module message function.
+/** Pass the parameters to the module specific nil_message() function.
+ *
+ * @param[in]  name         Module name.
+ * @param[in]  callid       The message identifier.
+ * @param[in]  call         The message parameters.
+ * @param[out] answer       The message answer parameters.
+ * @param[out] answer_count The last parameter for the actual answer
+ *                          in the answer parameter.
+ *
+ * @return EOK on success.
+ * @return ENOTSUP if the message is not known.
+ * @return Other error codes as defined for each specific
+ *          module message function.
+ *
  */
-int nil_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        return nil_message(callid, call, answer, answer_count);
+int nil_module_message(const char *name, ipc_callid_t callid,
+    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
+{
+        return nil_message(name, callid, call, answer, answer_count);
 }