Changeset 06b0211b in mainline for uspace/app

Timestamp:

2013-04-29T11:29:45Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

aa2b32c

Parents:

ba4799a (diff), df956b9b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

uspace/app

Files:

• bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
• bdsh/cmds/modules/sleep/sleep.c (modified) (1 diff)
• bnchmark/bnchmark.c (modified) (1 diff)
• init/init.c (modified) (1 diff)
• netecho/netecho.c (modified) (5 diffs)
• nettest3/nettest3.c (modified) (4 diffs)
• trace/ipc_desc.c (modified) (1 diff)
• trace/ipc_desc.h (modified) (1 diff)
• trace/ipcp.c (modified) (2 diffs)
• trace/syscalls.c (modified) (2 diffs)
• trace/syscalls.h (modified) (2 diffs)
• trace/trace.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -315 +315 @@
 {
         if (stat(path, &de->s)) {
-                cli_error(CL_ENOENT, path);
+                cli_error(CL_ENOENT, "%s", path);
                 return LS_BOGUS;
         }

uspace/app/bdsh/cmds/modules/sleep/sleep.c

@@ -114 +114 @@
         int ret;
         unsigned int argc;
-        useconds_t duration;
+        useconds_t duration = 0;
 
         /* Count the arguments */

uspace/app/bnchmark/bnchmark.c

@@ -142 +142 @@
 {
         int rc;
-        umseconds_t milliseconds_taken;
+        umseconds_t milliseconds_taken = 0;
         char *path = NULL;
         measure_func_t fn = NULL;

uspace/app/init/init.c

@@ -369 +369 @@
 #ifdef CONFIG_START_BD
         srv_start("/srv/ata_bd");
-        srv_start("/srv/gxe_bd");
 #endif
         

uspace/app/netecho/netecho.c

@@ -243 +243 @@
                 if (verbose)
                         printf("accept()\n");
-                socket_id = accept(listening_id, (void *) address_buf, &addrlen);
+                socket_id = accept(listening_id, (void *) address_buf, &addrlen);
                 if (socket_id <= 0) {
                         socket_print_error(stderr, socket_id, "Socket accept: ", "\n");
@@ -312 +312 @@
                                 rc = sendto(socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen);
                                 if (rc != EOK)
-                                        socket_print_error(stderr, rc, "Socket send: ", "\n");
+                                        socket_print_error(stderr, rc, "Socket sendto: ", "\n");
                         }
                 }
@@ -394 +394 @@
                 return listening_id;
         }
-
+        
+        /* Bind the listening socket */
+        rc = bind(listening_id, address, addrlen);
+        if (rc != EOK) {
+                socket_print_error(stderr, rc, "Socket bind: ", "\n");
+                return rc;
+        }
+        
         /* if the stream socket is used */
         if (type == SOCK_STREAM) {
@@ -402 +409 @@
                         backlog = 3;
                 }
-
+                
                 /* Set the backlog */
                 rc = listen(listening_id, backlog);
@@ -409 +416 @@
                         return rc;
                 }
-        }
-
-        /* Bind the listening socket */
-        rc = bind(listening_id, address, addrlen);
-        if (rc != EOK) {
-                socket_print_error(stderr, rc, "Socket bind: ", "\n");
-                return rc;
         }
 

uspace/app/nettest3/nettest3.c

@@ -63 +63 @@
         port = 7;
 
-        data = (char *)"Hello World!";
+        data = (char *) "Hello World!";
         size = str_size(data);
 
@@ -98 +98 @@
 
         printf("connect()\n");
-        rc = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
+        rc = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
         printf(" -> %d\n", rc);
         if (rc != 0)
@@ -115 +115 @@
         } while (rc > 0);
 
-        async_usleep(1000*1000);
+        async_usleep(1000 * 1000);
 
         printf("closesocket()\n");
@@ -124 +124 @@
 }
 
-
 /** @}
  */

uspace/app/trace/ipc_desc.c

@@ -49 +49 @@
         { IPC_M_DATA_READ,        "DATA_READ" },
         { IPC_M_DEBUG,            "DEBUG" },
-        
-        /* Terminating entry */
-        { 0, NULL }
 };
+
+size_t ipc_methods_len = sizeof(ipc_methods) / sizeof(ipc_m_desc_t);
 
 /** @}

uspace/app/trace/ipc_desc.h

@@ -42 +42 @@
 
 extern ipc_m_desc_t ipc_methods[];
+extern size_t ipc_methods_len;
 
 #endif

uspace/app/trace/ipcp.c

@@ -140 +140 @@
 void ipcp_init(void)
 {
-        ipc_m_desc_t *desc;
-        oper_t *oper;
-
         val_type_t arg_def[OPER_MAX_ARGS] = {
                 V_INTEGER,
@@ -162 +159 @@
         proto_system = proto_new("system");
 
-        desc = ipc_methods;
-        while (desc->number != 0) {
-                oper = oper_new(desc->name, OPER_MAX_ARGS, arg_def, V_INTEGER,
-                        OPER_MAX_ARGS, arg_def);
-                proto_add_oper(proto_system, desc->number, oper);
-
-                ++desc;
+        for (size_t i = 0; i < ipc_methods_len; i++) {
+                oper_t *oper = oper_new(ipc_methods[i].name, OPER_MAX_ARGS,
+                    arg_def, V_INTEGER, OPER_MAX_ARGS, arg_def);
+                proto_add_oper(proto_system, ipc_methods[i].number, oper);
         }
 

uspace/app/trace/syscalls.c

@@ -46 +46 @@
 
     [SYS_TASK_GET_ID] = { "task_get_id",                1,      V_ERRNO },
+    [SYS_TASK_SET_NAME] = { "task_set_name",            2,      V_ERRNO },
     [SYS_FUTEX_SLEEP] = { "futex_sleep_timeout",        3,      V_ERRNO },
     [SYS_FUTEX_WAKEUP] = { "futex_wakeup",              1,      V_ERRNO },
@@ -82 +83 @@
 };
 
+const size_t syscall_desc_len = (sizeof(syscall_desc) / sizeof(sc_desc_t));
+
 /** @}
  */

uspace/app/trace/syscalls.h

@@ -36 +36 @@
 #define SYSCALLS_H_
 
+#include <stdbool.h>
+#include <unistd.h>
+
 #include "trace.h"
 
@@ -45 +48 @@
 
 extern const sc_desc_t syscall_desc[];
+extern const size_t syscall_desc_len;
+
+static inline bool syscall_desc_defined(unsigned sc_id)
+{
+        return (sc_id < syscall_desc_len && syscall_desc[sc_id].name != NULL);
+}
 
 #endif

uspace/app/trace/trace.c

@@ -136 +136 @@
         }
 
-        free(task_ldr);
         task_ldr = NULL;
 
@@ -348 +347 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall name and arguments */
-                printf("%s", syscall_desc[sc_id].name);
-                print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+                if (syscall_desc_defined(sc_id)) {
+                        printf("%s", syscall_desc[sc_id].name);
+                        print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+                }
+                else {
+                        printf("unknown_syscall<%d>", sc_id);
+                        print_sc_args(sc_args, 6);
+                }
         }
 }
@@ -372 +377 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall return value */
-                rv_type = syscall_desc[sc_id].rv_type;
+                if (syscall_desc_defined(sc_id))
+                        rv_type = syscall_desc[sc_id].rv_type;
+                else
+                        rv_type = V_PTR;
                 print_sc_retval(sc_rc, rv_type);
         }
@@ -497 +505 @@
         ldr = loader_connect();
         if (ldr == NULL)
-                return 0;
+                return NULL;
 
         /* Get task ID. */