Changeset 66b1075 in mainline for uspace/srv/taskman/main.c
- Timestamp:
- 2020-01-05T03:04:38Z (4 years ago)
- 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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/taskman/main.c
r16d748ee r66b1075 72 72 static void connect_to_loader(ipc_call_t *icall) 73 73 { 74 DPRINTF("%s:% i from %llu\n", __func__, __LINE__, icall->task_id);74 DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id); 75 75 /* 76 76 * We don't accept the connection request, we forward it instead to … … 110 110 static void connect_to_ns(ipc_call_t *icall) 111 111 { 112 DPRINTF("%s , %llu\n", __func__, icall->task_id);112 DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id); 113 113 114 114 /* Wait until we know NS */ … … 130 130 static void taskman_new_task(ipc_call_t *icall) 131 131 { 132 DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id); 132 133 errno_t rc = task_intro(icall->task_id); 133 134 if (rc == EOK) { … … 140 141 static void taskman_i_am_ns(ipc_call_t *icall) 141 142 { 142 DPRINTF("%s , %llu\n", __func__, icall->task_id);143 DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id); 143 144 errno_t rc = EOK; 144 145 … … 184 185 bool wait_for_exit = ipc_get_arg2(icall); 185 186 186 DPRINTF("%s:% i from %llu/%i\n", __func__, __LINE__, sender, retval);187 DPRINTF("%s:%d from %" PRIu64 "/%i\n", __func__, __LINE__, sender, retval); 187 188 188 189 errno_t rc = task_set_retval(sender, retval, wait_for_exit); … … 192 193 static void taskman_ctl_ev_callback(ipc_call_t *icall) 193 194 { 194 DPRINTF("%s:% i from %llu\n", __func__, __LINE__, icall->task_id);195 DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id); 195 196 196 197 bool past_events = ipc_get_arg1(icall); … … 210 211 task_id_t id = MERGE_LOUP32(ipc_get_arg1(icall), ipc_get_arg2(icall)); 211 212 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); 213 214 task_terminated(id, exit_reason); 214 215 } … … 217 218 { 218 219 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); 220 221 task_failed(id); 221 222 } … … 223 224 static void loader_callback(ipc_call_t *icall) 224 225 { 225 DPRINTF("%s:% i from %llu\n", __func__, __LINE__, icall->task_id);226 DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id); 226 227 // TODO check that loader is expected, would probably discard prodcons 227 228 // scheme … … 262 263 return; 263 264 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)); 264 269 async_answer_0(icall, ENOTSUP); 265 270 return; … … 271 276 return; 272 277 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)); 273 282 async_answer_0(icall, ENOTSUP); 274 283 return; … … 282 291 if (!async_get_call(&call)) { 283 292 /* Client disconnected */ 293 DPRINTF("%s:%d client disconnected\n", __func__, __LINE__); 284 294 return; 285 295 } … … 299 309 break; 300 310 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)); 301 315 async_answer_0(&call, ENOTSUP); 302 316 }
Note:
See TracChangeset
for help on using the changeset viewer.