Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 66b1075 in mainline


Ignore:
Timestamp:
2020-01-05T03:04:38Z (9 months 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:
5 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/sysman/connection_ctl.c

    r16d748ee r66b1075  
    145145        unit_handle_t handle = ipc_get_arg1(icall);
    146146        sysarg_t flags = ipc_get_arg2(icall);
    147         sysman_log(LVL_DEBUG2, "%s(%p, %lx, %i)", __func__, icall->cap_handle, flags, state);
     147        sysman_log(LVL_DEBUG2, "%s(%p, %" SCNuPTR ", %i)", __func__, icall->cap_handle, flags, state);
    148148
    149149        unit_t *unit = repo_find_unit_by_handle(handle);
  • uspace/srv/sysman/test/job_closure.c

    r16d748ee r66b1075  
    5252{
    5353        if (expected->size != actual->size) {
    54                 printf("%s: |expected|, |actual| = %lu, %lu\n",
     54                printf("%s: |expected|, |actual| = %zu, %zu\n",
    5555                    __func__, expected->size, actual->size);
    5656                return false;
  • uspace/srv/sysman/units/unit_cfg.c

    r16d748ee r66b1075  
    136136        list_foreach(text_parse.errors, link, text_parse_error_t, err) {
    137137                sysman_log(LVL_WARN,
    138                     "Error (%i) when parsing '%s' on line %lu.",
     138                    "Error (%i) when parsing '%s' on line %zu.",
    139139                    err->parse_errno, fn, err->lineno);
    140140        }
  • uspace/srv/taskman/main.c

    r16d748ee r66b1075  
    7272static void connect_to_loader(ipc_call_t *icall)
    7373{
    74         DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
     74        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
    7575        /*
    7676         * We don't accept the connection request, we forward it instead to
     
    110110static void connect_to_ns(ipc_call_t *icall)
    111111{
    112         DPRINTF("%s, %llu\n", __func__, icall->task_id);
     112        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
    113113
    114114        /* Wait until we know NS */
     
    130130static void taskman_new_task(ipc_call_t *icall)
    131131{
     132        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
    132133        errno_t rc = task_intro(icall->task_id);
    133134        if (rc == EOK) {
     
    140141static void taskman_i_am_ns(ipc_call_t *icall)
    141142{
    142         DPRINTF("%s, %llu\n", __func__, icall->task_id);
     143        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
    143144        errno_t rc = EOK;
    144145
     
    184185        bool wait_for_exit = ipc_get_arg2(icall);
    185186
    186         DPRINTF("%s:%i from %llu/%i\n", __func__, __LINE__, sender, retval);
     187        DPRINTF("%s:%d from %" PRIu64 "/%i\n", __func__, __LINE__, sender, retval);
    187188
    188189        errno_t rc = task_set_retval(sender, retval, wait_for_exit);
     
    192193static void taskman_ctl_ev_callback(ipc_call_t *icall)
    193194{
    194         DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
     195        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
    195196
    196197        bool past_events = ipc_get_arg1(icall);
     
    210211        task_id_t id = MERGE_LOUP32(ipc_get_arg1(icall), ipc_get_arg2(icall));
    211212        exit_reason_t exit_reason = ipc_get_arg3(icall);
    212         DPRINTF("%s:%i from %llu/%i\n", __func__, __LINE__, id, exit_reason);
     213        DPRINTF("%s:%d from %" PRIu64 "/%i\n", __func__, __LINE__, id, exit_reason);
    213214        task_terminated(id, exit_reason);
    214215}
     
    217218{
    218219        task_id_t id = MERGE_LOUP32(ipc_get_arg1(icall), ipc_get_arg2(icall));
    219         DPRINTF("%s:%i from %llu\n", __func__, __LINE__, id);
     220        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, id);
    220221        task_failed(id);
    221222}
     
    223224static void loader_callback(ipc_call_t *icall)
    224225{
    225         DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
     226        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
    226227        // TODO check that loader is expected, would probably discard prodcons
    227228        //      scheme
     
    262263                        return;
    263264                default:
     265                        DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
     266                            __func__, __LINE__,
     267                            icall->task_id, ipc_get_imethod(icall),
     268                            ipc_get_arg1(icall), ipc_get_arg2(icall));
    264269                        async_answer_0(icall, ENOTSUP);
    265270                        return;
     
    271276                        return;
    272277                default:
     278                        DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
     279                            __func__, __LINE__,
     280                            icall->task_id, ipc_get_imethod(icall),
     281                            ipc_get_arg1(icall), ipc_get_arg2(icall));
    273282                        async_answer_0(icall, ENOTSUP);
    274283                        return;
     
    282291                if (!async_get_call(&call)) {
    283292                        /* Client disconnected */
     293                        DPRINTF("%s:%d client disconnected\n", __func__, __LINE__);
    284294                        return;
    285295                }
     
    299309                        break;
    300310                default:
     311                        DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
     312                            __func__, __LINE__,
     313                            call.task_id, ipc_get_imethod(&call),
     314                            ipc_get_arg1(&call), ipc_get_arg2(&call));
    301315                        async_answer_0(&call, ENOTSUP);
    302316                }
  • uspace/srv/taskman/task.c

    r16d748ee r66b1075  
    216216
    217217        hash_table_insert(&task_hash_table, &t->link);
    218         DPRINTF("%s: %llu\n", __func__, t->id);
     218        DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, t->id);
    219219
    220220finish:
Note: See TracChangeset for help on using the changeset viewer.