Changeset 66b1075 in mainline

Timestamp:

2020-01-05T03:04:38Z (4 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

fb86ff19

Parents:

16d748ee

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-11-30 22:34:36)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-01-05 03:04:38)

Message:

improving architecture independency of newly added taskman and sysman

Location:

uspace/srv

Files:

• sysman/connection_ctl.c (modified) (1 diff)
• sysman/test/job_closure.c (modified) (1 diff)
• sysman/units/unit_cfg.c (modified) (1 diff)
• taskman/main.c (modified) (13 diffs)
• taskman/task.c (modified) (1 diff)

uspace/srv/sysman/connection_ctl.c

@@ -145 +145 @@
         unit_handle_t handle = ipc_get_arg1(icall);
         sysarg_t flags = ipc_get_arg2(icall);
-        sysman_log(LVL_DEBUG2, "%s(%p, %lx, %i)", __func__, icall->cap_handle, flags, state);
+        sysman_log(LVL_DEBUG2, "%s(%p, %" SCNuPTR ", %i)", __func__, icall->cap_handle, flags, state);
 
         unit_t *unit = repo_find_unit_by_handle(handle);

uspace/srv/sysman/test/job_closure.c

@@ -52 +52 @@
 {
         if (expected->size != actual->size) {
-                printf("%s: |expected|, |actual| = %lu, %lu\n",
+                printf("%s: |expected|, |actual| = %zu, %zu\n",
                     __func__, expected->size, actual->size);
                 return false;

uspace/srv/sysman/units/unit_cfg.c

@@ -136 +136 @@
         list_foreach(text_parse.errors, link, text_parse_error_t, err) {
                 sysman_log(LVL_WARN,
-                    "Error (%i) when parsing '%s' on line %lu.",
+                    "Error (%i) when parsing '%s' on line %zu.",
                     err->parse_errno, fn, err->lineno);
         }

uspace/srv/taskman/main.c

@@ -72 +72 @@
 static void connect_to_loader(ipc_call_t *icall)
 {
-        DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
+        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
         /*
          * We don't accept the connection request, we forward it instead to
@@ -110 +110 @@
 static void connect_to_ns(ipc_call_t *icall)
 {
-        DPRINTF("%s, %llu\n", __func__, icall->task_id);
+        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
 
         /* Wait until we know NS */
@@ -130 +130 @@
 static void taskman_new_task(ipc_call_t *icall)
 {
+        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
         errno_t rc = task_intro(icall->task_id);
         if (rc == EOK) {
@@ -140 +141 @@
 static void taskman_i_am_ns(ipc_call_t *icall)
 {
-        DPRINTF("%s, %llu\n", __func__, icall->task_id);
+        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
         errno_t rc = EOK;
 
@@ -184 +185 @@
         bool wait_for_exit = ipc_get_arg2(icall);
 
-        DPRINTF("%s:%i from %llu/%i\n", __func__, __LINE__, sender, retval);
+        DPRINTF("%s:%d from %" PRIu64 "/%i\n", __func__, __LINE__, sender, retval);
 
         errno_t rc = task_set_retval(sender, retval, wait_for_exit);
@@ -192 +193 @@
 static void taskman_ctl_ev_callback(ipc_call_t *icall)
 {
-        DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
+        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
 
         bool past_events = ipc_get_arg1(icall);
@@ -210 +211 @@
         task_id_t id = MERGE_LOUP32(ipc_get_arg1(icall), ipc_get_arg2(icall));
         exit_reason_t exit_reason = ipc_get_arg3(icall);
-        DPRINTF("%s:%i from %llu/%i\n", __func__, __LINE__, id, exit_reason);
+        DPRINTF("%s:%d from %" PRIu64 "/%i\n", __func__, __LINE__, id, exit_reason);
         task_terminated(id, exit_reason);
 }
@@ -217 +218 @@
 {
         task_id_t id = MERGE_LOUP32(ipc_get_arg1(icall), ipc_get_arg2(icall));
-        DPRINTF("%s:%i from %llu\n", __func__, __LINE__, id);
+        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, id);
         task_failed(id);
 }
@@ -223 +224 @@
 static void loader_callback(ipc_call_t *icall)
 {
-        DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
+        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
         // TODO check that loader is expected, would probably discard prodcons
         //      scheme
@@ -262 +263 @@
                         return;
                 default:
+                        DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
+                            __func__, __LINE__,
+                            icall->task_id, ipc_get_imethod(icall),
+                            ipc_get_arg1(icall), ipc_get_arg2(icall));
                         async_answer_0(icall, ENOTSUP);
                         return;
@@ -271 +276 @@
                         return;
                 default:
+                        DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
+                            __func__, __LINE__,
+                            icall->task_id, ipc_get_imethod(icall),
+                            ipc_get_arg1(icall), ipc_get_arg2(icall));
                         async_answer_0(icall, ENOTSUP);
                         return;
@@ -282 +291 @@
                 if (!async_get_call(&call)) {
                         /* Client disconnected */
+                        DPRINTF("%s:%d client disconnected\n", __func__, __LINE__);
                         return;
                 }
@@ -299 +309 @@
                         break;
                 default:
+                        DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
+                            __func__, __LINE__,
+                            call.task_id, ipc_get_imethod(&call),
+                            ipc_get_arg1(&call), ipc_get_arg2(&call));
                         async_answer_0(&call, ENOTSUP);
                 }

uspace/srv/taskman/task.c

@@ -216 +216 @@
 
         hash_table_insert(&task_hash_table, &t->link);
-        DPRINTF("%s: %llu\n", __func__, t->id);
+        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, t->id);
 
 finish: