Changeset 8565a42 in mainline for uspace/app/trace

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

uspace/app/trace

Files:

• ipcp.c (modified) (7 diffs)
• proto.h (modified) (2 diffs)
• trace.c (modified) (17 diffs)
• trace.h (modified) (1 diff)

uspace/app/trace/ipcp.c

@@ -253 +253 @@
         proto_t *proto;
         int cphone;
-        
+
         sysarg_t *resp;
         oper_t *oper;
         int i;
-        
+
         phone = pcall->phone_hash;
         method = IPC_GET_IMETHOD(pcall->question);
         retval = IPC_GET_RETVAL(*answer);
-        
+
         resp = answer->args;
-        
+
         if ((display_mask & DM_IPC) != 0) {
                 printf("Response to %d: retval=%s, args = (%" PRIun ", "
@@ -271 +271 @@
                     IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
         }
-        
+
         if ((display_mask & DM_USER) != 0) {
                 oper = pcall->oper;
-                
+
                 if ((oper != NULL) &&
                     ((oper->rv_type != V_VOID) || (oper->respc > 0))) {
                         printf("->");
-                        
+
                         if (oper->rv_type != V_VOID) {
                                 putchar(' ');
                                 val_print((sysarg_t) retval, oper->rv_type);
                         }
-                        
+
                         if (oper->respc > 0) {
                                 putchar(' ');
@@ -294 +294 @@
                                 putchar(')');
                         }
-                        
+
                         putchar('\n');
                 }
         }
-        
+
         if ((phone == PHONE_NS) && (method == IPC_M_CONNECT_ME_TO) &&
             (retval == 0)) {
@@ -306 +306 @@
                 if (proto == NULL)
                         proto = proto_unknown;
-                
+
                 cphone = IPC_GET_ARG5(*answer);
                 if ((display_mask & DM_SYSTEM) != 0) {
@@ -312 +312 @@
                     proto->name);
                 }
-                
+
                 ipcp_connection_set(cphone, 0, proto);
         }
@@ -321 +321 @@
         ht_link_t *item;
         pending_call_t *pcall;
-        
+
         if ((call->flags & IPC_CALL_ANSWERED) == 0) {
                 /* Not a response */
@@ -329 +329 @@
                 return;
         }
-        
+
         item = hash_table_find(&pending_calls, &hash);
         if (item == NULL)
                 return; /* No matching question found */
-        
+
         /*
          * Response matched to question.
          */
-        
+
         pcall = hash_table_get_inst(item, pending_call_t, link);
         hash_table_remove(&pending_calls, &hash);
-        
+
         parse_answer(hash, pcall, call);
         free(pcall);

uspace/app/trace/proto.h

@@ -44 +44 @@
 typedef struct {
         const char *name;
-        
+
         int argc;
         val_type_t arg_type[OPER_MAX_ARGS];
-        
+
         val_type_t rv_type;
-        
+
         int respc;
         val_type_t resp_type[OPER_MAX_ARGS];
@@ -57 +57 @@
         /** Protocol name */
         const char *name;
-        
+
         /** Maps method number to operation */
         hash_table_t method_oper;

uspace/app/trace/trace.c

@@ -146 +146 @@
 {
         async_sess_t *ksess = async_connect_kbox(task_id);
-        
+
         if (!ksess) {
                 if (errno == ENOTSUP) {
@@ -155 +155 @@
                         return errno;
                 }
-                
+
                 printf("Error connecting\n");
                 printf("ipc_connect_task(%" PRIu64 ") -> %s ", task_id, str_error_name(errno));
                 return errno;
         }
-        
+
         errno_t rc = udebug_begin(ksess);
         if (rc != EOK) {
@@ -166 +166 @@
                 return rc;
         }
-        
+
         rc = udebug_set_evmask(ksess, UDEBUG_EM_ALL);
         if (rc != EOK) {
@@ -172 +172 @@
                 return rc;
         }
-        
+
         sess = ksess;
         return 0;
@@ -283 +283 @@
         ipc_call_t call;
         sysarg_t phoneid;
-        
+
         if (sc_rc != EOK)
                 return;
@@ -324 +324 @@
         memset(&call, 0, sizeof(call));
         rc = udebug_mem_read(sess, &call, sc_args[0], sizeof(call));
-        
+
         if (rc == EOK)
                 ipcp_call_in(&call, sc_rc);
@@ -525 +525 @@
         int fd_stdout;
         int fd_stderr;
-        
+
         fd_root = vfs_root();
         if (fd_root >= 0) {
@@ -533 +533 @@
                         goto error;
         }
-        
+
         if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK)) {
                 rc = loader_add_inbox(ldr, "stdin", fd_stdin);
@@ -539 +539 @@
                         goto error;
         }
-        
+
         if ((stdout != NULL) && (vfs_fhandle(stdout, &fd_stdout) == EOK)) {
                 rc = loader_add_inbox(ldr, "stdout", fd_stdout);
@@ -545 +545 @@
                         goto error;
         }
-        
+
         if ((stderr != NULL) && (vfs_fhandle(stderr, &fd_stderr) == EOK)) {
                 rc = loader_add_inbox(ldr, "stderr", fd_stderr);
@@ -551 +551 @@
                         goto error;
         }
-        
+
         /* Load the program. */
         rc = loader_load_program(ldr);
@@ -571 +571 @@
 
         (void) arg;
-        
+
         console_ctrl_t *console = console_init(stdin, stdout);
-        
+
         while (true) {
                 fibril_mutex_lock(&state_lock);
@@ -579 +579 @@
                         fibril_condvar_wait(&state_cv, &state_lock);
                 fibril_mutex_unlock(&state_lock);
-                
+
                 if (!console_get_event(console, &event))
                         return EINVAL;
-                
+
                 if (event.type == CEV_KEY) {
                         fibril_mutex_lock(&state_lock);
@@ -750 +750 @@
         display_mask_t dm = 0;
         const char *c = text;
-        
+
         while (*c) {
                 switch (*c) {
@@ -769 +769 @@
                         exit(1);
                 }
-                
+
                 ++c;
         }
-        
+
         return dm;
 }
@@ -810 +810 @@
                         break;
                 }
-                
+
                 --argc;
                 ++argv;
@@ -831 +831 @@
         /* Preload the specified program file. */
         printf("Spawning '%s' with arguments:\n", *argv);
-        
+
         char **cp = argv;
         while (*cp)
                 printf("'%s'\n", *cp++);
-        
+
         task_ldr = preload_task(*argv, argv, &task_id);
         task_wait_for = true;

uspace/app/trace/trace.h

@@ -42 +42 @@
  */
 typedef enum {
-        
+
         DM_THREAD       = 1,    /**< Thread creation and termination events */
         DM_SYSCALL      = 2,    /**< System calls */