Index: uspace/lib/c/generic/adt/checksum.c =================================================================== --- uspace/lib/c/generic/adt/checksum.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/adt/checksum.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -136,8 +136,8 @@ { uint32_t crc; - + for (crc = ~seed; length > 0; length--) crc = poly_table[((uint8_t) crc ^ *(data++))] ^ (crc >> 8); - + return (~crc); } Index: uspace/lib/c/generic/adt/circ_buf.c =================================================================== --- uspace/lib/c/generic/adt/circ_buf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/adt/circ_buf.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -30,5 +30,5 @@ * @{ */ - + /** @file Circular buffer */ Index: uspace/lib/c/generic/adt/hash_table.c =================================================================== --- uspace/lib/c/generic/adt/hash_table.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/adt/hash_table.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -96,14 +96,14 @@ assert(h); assert(op && op->hash && op->key_hash && op->key_equal); - + /* Check for compulsory ops. */ if (!op || !op->hash || !op->key_hash || !op->key_equal) return false; - + h->bucket_cnt = round_up_size(init_size); - + if (!alloc_table(h->bucket_cnt, &h->bucket)) return false; - + h->max_load = (max_load == 0) ? HT_MAX_LOAD : max_load; h->item_cnt = 0; @@ -115,5 +115,5 @@ h->op->remove_callback = nop_remove_callback; } - + return true; } @@ -128,7 +128,7 @@ assert(h && h->bucket); assert(!h->apply_ongoing); - + clear_items(h); - + free(h->bucket); @@ -159,7 +159,7 @@ assert(h && h->bucket); assert(!h->apply_ongoing); - + clear_items(h); - + /* Shrink the table to its minimum size if possible. */ if (HT_MIN_BUCKETS < h->bucket_cnt) { @@ -173,15 +173,15 @@ if (h->item_cnt == 0) return; - + for (size_t idx = 0; idx < h->bucket_cnt; ++idx) { list_foreach_safe(h->bucket[idx], cur, next) { assert(cur); ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link); - + list_remove(cur); h->op->remove_callback(cur_link); } } - + h->item_cnt = 0; } @@ -197,7 +197,7 @@ assert(h && h->bucket); assert(!h->apply_ongoing); - + size_t idx = h->op->hash(item) % h->bucket_cnt; - + list_append(&item->link, &h->bucket[idx]); ++h->item_cnt; @@ -220,7 +220,7 @@ assert(h->op && h->op->hash && h->op->equal); assert(!h->apply_ongoing); - + size_t idx = h->op->hash(item) % h->bucket_cnt; - + /* Check for duplicates. */ list_foreach(h->bucket[idx], link, ht_link_t, cur_link) { @@ -232,9 +232,9 @@ return false; } - + list_append(&item->link, &h->bucket[idx]); ++h->item_cnt; grow_if_needed(h); - + return true; } @@ -251,5 +251,5 @@ { assert(h && h->bucket); - + size_t idx = h->op->key_hash(key) % h->bucket_cnt; @@ -264,5 +264,5 @@ } } - + return NULL; } @@ -306,12 +306,12 @@ assert(h && h->bucket); assert(!h->apply_ongoing); - + size_t idx = h->op->key_hash(key) % h->bucket_cnt; size_t removed = 0; - + list_foreach_safe(h->bucket[idx], cur, next) { ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link); - + if (h->op->key_equal(key, cur_link)) { ++removed; @@ -323,5 +323,5 @@ h->item_cnt -= removed; shrink_if_needed(h); - + return removed; } @@ -353,10 +353,10 @@ assert(f); assert(h && h->bucket); - + if (h->item_cnt == 0) return; - + h->apply_ongoing = true; - + for (size_t idx = 0; idx < h->bucket_cnt; ++idx) { list_foreach_safe(h->bucket[idx], cur, next) { @@ -372,5 +372,5 @@ out: h->apply_ongoing = false; - + shrink_if_needed(h); grow_if_needed(h); @@ -381,9 +381,9 @@ { size_t rounded_size = HT_MIN_BUCKETS; - + while (rounded_size < size) { rounded_size = 2 * rounded_size + 1; } - + return rounded_size; } @@ -393,9 +393,9 @@ { assert(pbuckets && HT_MIN_BUCKETS <= bucket_cnt); - + list_t *buckets = malloc(bucket_cnt * sizeof(list_t)); if (!buckets) return false; - + for (size_t i = 0; i < bucket_cnt; i++) list_initialize(&buckets[i]); @@ -435,9 +435,9 @@ assert(h && h->bucket); assert(HT_MIN_BUCKETS <= new_bucket_cnt); - + /* We are traversing the table and resizing would mess up the buckets. */ if (h->apply_ongoing) return; - + list_t *new_buckets; @@ -445,5 +445,5 @@ if (!alloc_table(new_bucket_cnt, &new_buckets)) return; - + if (0 < h->item_cnt) { /* Rehash all the items to the new table. */ @@ -458,5 +458,5 @@ } } - + free(h->bucket); h->bucket = new_buckets; Index: uspace/lib/c/generic/adt/list.c =================================================================== --- uspace/lib/c/generic/adt/list.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/adt/list.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -57,5 +57,5 @@ bool found = false; link_t *hlp = list->head.next; - + while (hlp != &list->head) { if (hlp == link) { @@ -65,5 +65,5 @@ hlp = hlp->next; } - + return found; } @@ -81,13 +81,13 @@ if (list_empty(list)) return; - + /* Attach list to destination. */ list->head.next->prev = pos; list->head.prev->next = pos->next; - + /* Link destination list to the added list. */ pos->next->prev = list->head.prev; pos->next = list->head.next; - + list_initialize(list); } @@ -103,5 +103,5 @@ { unsigned long count = 0; - + link_t *link = list_first(list); while (link != NULL) { @@ -109,5 +109,5 @@ link = list_next(link, list); } - + return count; } Index: uspace/lib/c/generic/adt/odict.c =================================================================== --- uspace/lib/c/generic/adt/odict.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/adt/odict.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -30,5 +30,5 @@ * @{ */ - + /** @file Ordered dictionary. * Index: uspace/lib/c/generic/adt/prodcons.c =================================================================== --- uspace/lib/c/generic/adt/prodcons.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/adt/prodcons.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -47,8 +47,8 @@ { fibril_mutex_lock(&pc->mtx); - + list_append(item, &pc->list); fibril_condvar_signal(&pc->cv); - + fibril_mutex_unlock(&pc->mtx); } @@ -57,13 +57,13 @@ { fibril_mutex_lock(&pc->mtx); - + while (list_empty(&pc->list)) fibril_condvar_wait(&pc->cv, &pc->mtx); - + link_t *head = list_first(&pc->list); list_remove(head); - + fibril_mutex_unlock(&pc->mtx); - + return head; } Index: uspace/lib/c/generic/arg_parse.c =================================================================== --- uspace/lib/c/generic/arg_parse.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/arg_parse.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -39,8 +39,8 @@ if (str_cmp(arg, ashort) == 0) return 0; - + if (str_lcmp(arg, along, str_length(along)) == 0) return str_length(along); - + return -1; } @@ -69,5 +69,5 @@ { char *rest; - + if (offset) *value = strtol(argv[*index] + offset, &rest, 10); @@ -77,8 +77,8 @@ } else return ENOENT; - + if ((rest) && (*rest)) return EINVAL; - + return EOK; } @@ -109,9 +109,9 @@ { char *arg; - + errno_t ret = arg_parse_string(argc, argv, index, &arg, offset); if (ret != EOK) return ret; - + return parser(arg, value); } @@ -145,5 +145,5 @@ } else return ENOENT; - + return EOK; } Index: uspace/lib/c/generic/assert.c =================================================================== --- uspace/lib/c/generic/assert.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/assert.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -48,5 +48,5 @@ kio_printf("Assertion failed (%s) in file \"%s\", line %u.\n", cond, file, line); - + /* Sometimes we know in advance that regular printf() would likely fail. */ abort(); @@ -60,5 +60,5 @@ kio_printf("Assertion failed (%s) in file \"%s\", line %u.\n", cond, file, line); - + /* * Check if this is a nested or parallel assert. @@ -66,5 +66,5 @@ if (atomic_postinc(&failed_asserts)) abort(); - + /* * Attempt to print the message to standard output and display @@ -75,5 +75,5 @@ cond, file, line); stacktrace_print(); - + abort(); } Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/async.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -125,32 +125,32 @@ /** List of inactive exchanges */ list_t exch_list; - + /** Session interface */ iface_t iface; - + /** Exchange management style */ exch_mgmt_t mgmt; - + /** Session identification */ int phone; - + /** First clone connection argument */ sysarg_t arg1; - + /** Second clone connection argument */ sysarg_t arg2; - + /** Third clone connection argument */ sysarg_t arg3; - + /** Exchange mutex */ fibril_mutex_t mutex; - + /** Number of opened exchanges */ atomic_t refcnt; - + /** Mutex for stateful connections */ fibril_mutex_t remote_state_mtx; - + /** Data for stateful connections */ void *remote_state_data; @@ -161,11 +161,11 @@ /** Link into list of inactive exchanges */ link_t sess_link; - + /** Link into global list of inactive exchanges */ link_t global_link; - + /** Session pointer */ async_sess_t *sess; - + /** Exchange identification */ int phone; @@ -184,5 +184,5 @@ typedef struct { link_t link; - + cap_handle_t chandle; ipc_call_t call; @@ -192,17 +192,17 @@ typedef struct { awaiter_t wdata; - + /** If reply was received. */ bool done; - + /** If the message / reply should be discarded on arrival. */ bool forget; - + /** If already destroyed. */ bool destroyed; - + /** Pointer to where the answer data is stored. */ ipc_call_t *dataptr; - + errno_t retval; } amsg_t; @@ -211,5 +211,5 @@ typedef struct { ht_link_t link; - + task_id_t in_task_id; atomic_t refcnt; @@ -220,32 +220,32 @@ typedef struct { awaiter_t wdata; - + /** Hash table link. */ ht_link_t link; - + /** Incoming client task ID. */ task_id_t in_task_id; - + /** Incoming phone hash. */ sysarg_t in_phone_hash; - + /** Link to the client tracking structure. */ client_t *client; - + /** Messages that should be delivered to this fibril. */ list_t msg_queue; - + /** Identification of the opening call. */ cap_handle_t chandle; - + /** Call data of the opening call. */ ipc_call_t call; - + /** Identification of the closing call. */ cap_handle_t close_chandle; - + /** Fibril function that will be used to handle the connection. */ async_port_handler_t handler; - + /** Client data */ void *data; @@ -255,14 +255,14 @@ typedef struct { ht_link_t link; - + /** Interface ID */ iface_t iface; - + /** Futex protecting the hash table */ futex_t futex; - + /** Interface ports */ hash_table_t port_hash_table; - + /** Next available port ID */ port_id_t port_id_avail; @@ -272,11 +272,11 @@ typedef struct { ht_link_t link; - + /** Port ID */ port_id_t id; - + /** Port connection handler */ async_port_handler_t handler; - + /** Client data */ void *data; @@ -286,11 +286,11 @@ typedef struct { ht_link_t link; - + /** Notification method */ sysarg_t imethod; - + /** Notification handler */ async_notification_handler_t handler; - + /** Notification data */ void *data; @@ -303,5 +303,5 @@ { struct timeval tv = { 0, 0 }; - + to->inlist = false; to->occurred = false; @@ -335,5 +335,5 @@ awaiter_initialize(&msg->wdata); } - + return msg; } @@ -456,5 +456,5 @@ if (!interface) return NULL; - + bool ret = hash_table_create(&interface->port_hash_table, 0, 0, &port_hash_table_ops); @@ -463,11 +463,11 @@ return NULL; } - + interface->iface = iface; futex_initialize(&interface->futex, 1); interface->port_id_avail = 0; - + hash_table_insert(&interface_hash_table, &interface->link); - + return interface; } @@ -479,18 +479,18 @@ if (!port) return NULL; - + futex_down(&interface->futex); - + port_id_t id = interface->port_id_avail; interface->port_id_avail++; - + port->id = id; port->handler = handler; port->data = data; - + hash_table_insert(&interface->port_hash_table, &port->link); - + futex_up(&interface->futex); - + return port; } @@ -516,9 +516,9 @@ if ((iface & IFACE_MOD_MASK) == IFACE_MOD_CALLBACK) return EINVAL; - + interface_t *interface; - + futex_down(&async_futex); - + ht_link_t *link = hash_table_find(&interface_hash_table, &iface); if (link) @@ -526,10 +526,10 @@ else interface = async_new_interface(iface); - + if (!interface) { futex_up(&async_futex); return ENOMEM; } - + port_t *port = async_new_port(interface, handler, data); if (!port) { @@ -537,9 +537,9 @@ return ENOMEM; } - + *port_id = port->id; - + futex_up(&async_futex); - + return EOK; } @@ -548,5 +548,5 @@ { assert(handler != NULL); - + fallback_port_handler = handler; fallback_port_data = data; @@ -645,5 +645,5 @@ { client_t *client = NULL; - + futex_down(&async_futex); ht_link_t *link = hash_table_find(&client_hash_table, &client_id); @@ -656,10 +656,10 @@ client->in_task_id = client_id; client->data = async_client_data_create(); - + atomic_set(&client->refcnt, 1); hash_table_insert(&client_hash_table, &client->link); } } - + futex_up(&async_futex); return client; @@ -669,7 +669,7 @@ { bool destroy; - + futex_down(&async_futex); - + if (atomic_predec(&client->refcnt) == 0) { hash_table_remove(&client_hash_table, &client->in_task_id); @@ -677,11 +677,11 @@ } else destroy = false; - + futex_up(&async_futex); - + if (destroy) { if (client->data) async_client_data_destroy(client->data); - + free(client); } @@ -701,10 +701,10 @@ { assert(arg); - + /* * Setup fibril-local connection pointer. */ fibril_connection = (connection_t *) arg; - + /* * Add our reference for the current connection in the client task @@ -712,5 +712,5 @@ * hash in a new tracking structure. */ - + client_t *client = async_client_get(fibril_connection->in_task_id, true); if (!client) { @@ -718,7 +718,7 @@ return 0; } - + fibril_connection->client = client; - + /* * Call the connection handler function. @@ -726,10 +726,10 @@ fibril_connection->handler(fibril_connection->chandle, &fibril_connection->call, fibril_connection->data); - + /* * Remove the reference for this client task connection. */ async_client_put(client); - + /* * Remove myself from the connection hash table. @@ -741,5 +741,5 @@ }); futex_up(&async_futex); - + /* * Answer all remaining messages with EHANGUP. @@ -749,10 +749,10 @@ list_get_instance(list_first(&fibril_connection->msg_queue), msg_t, link); - + list_remove(&msg->link); ipc_answer_0(msg->chandle, EHANGUP); free(msg); } - + /* * If the connection was hung-up, answer the last call, @@ -761,5 +761,5 @@ if (fibril_connection->close_chandle) ipc_answer_0(fibril_connection->close_chandle, EOK); - + free(fibril_connection); return EOK; @@ -793,8 +793,8 @@ if (chandle != CAP_NIL) ipc_answer_0(chandle, ENOMEM); - + return (uintptr_t) NULL; } - + conn->in_task_id = in_task_id; conn->in_phone_hash = in_phone_hash; @@ -804,29 +804,29 @@ conn->handler = handler; conn->data = data; - + if (call) conn->call = *call; - + /* We will activate the fibril ASAP */ conn->wdata.active = true; conn->wdata.fid = fibril_create(connection_fibril, conn); - + if (conn->wdata.fid == 0) { free(conn); - + if (chandle != CAP_NIL) ipc_answer_0(chandle, ENOMEM); - + return (uintptr_t) NULL; } - + /* Add connection to the connection hash table */ - + futex_down(&async_futex); hash_table_insert(&conn_hash_table, &conn->link); futex_up(&async_futex); - + fibril_add_ready(conn->wdata.fid); - + return conn->wdata.fid; } @@ -852,22 +852,22 @@ if ((iface & IFACE_MOD_CALLBACK) != IFACE_MOD_CALLBACK) return EINVAL; - + if (exch == NULL) return ENOENT; - + ipc_call_t answer; aid_t req = async_send_3(exch, IPC_M_CONNECT_TO_ME, iface, arg1, arg2, &answer); - + errno_t ret; async_wait_for(req, &ret); if (ret != EOK) return (errno_t) ret; - + sysarg_t phone_hash = IPC_GET_ARG5(answer); interface_t *interface; - + futex_down(&async_futex); - + ht_link_t *link = hash_table_find(&interface_hash_table, &iface); if (link) @@ -875,10 +875,10 @@ else interface = async_new_interface(iface); - + if (!interface) { futex_up(&async_futex); return ENOMEM; } - + port_t *port = async_new_port(interface, handler, data); if (!port) { @@ -886,14 +886,14 @@ return ENOMEM; } - + *port_id = port->id; - + futex_up(&async_futex); - + fid_t fid = async_new_connection(answer.in_task_id, phone_hash, CAP_NIL, NULL, handler, data); if (fid == (uintptr_t) NULL) return ENOMEM; - + return EOK; } @@ -937,19 +937,19 @@ { assert(wd); - + wd->to_event.occurred = false; wd->to_event.inlist = true; - + link_t *tmp = timeout_list.head.next; while (tmp != &timeout_list.head) { awaiter_t *cur = list_get_instance(tmp, awaiter_t, to_event.link); - + if (tv_gteq(&cur->to_event.expires, &wd->to_event.expires)) break; - + tmp = tmp->next; } - + list_insert_before(&wd->to_event.link, tmp); } @@ -971,7 +971,7 @@ { assert(call); - + futex_down(&async_futex); - + ht_link_t *link = hash_table_find(&conn_hash_table, &(conn_key_t){ .task_id = call->in_task_id, @@ -982,7 +982,7 @@ return false; } - + connection_t *conn = hash_table_get_inst(link, connection_t, link); - + msg_t *msg = malloc(sizeof(*msg)); if (!msg) { @@ -990,15 +990,15 @@ return false; } - + msg->chandle = chandle; msg->call = *call; list_append(&msg->link, &conn->msg_queue); - + if (IPC_GET_IMETHOD(*call) == IPC_M_PHONE_HUNGUP) conn->close_chandle = chandle; - + /* If the connection fibril is waiting for an event, activate it */ if (!conn->wdata.active) { - + /* If in timeout list, remove it */ if (conn->wdata.to_event.inlist) { @@ -1006,9 +1006,9 @@ list_remove(&conn->wdata.to_event.link); } - + conn->wdata.active = true; fibril_add_ready(conn->wdata.fid); } - + futex_up(&async_futex); return true; @@ -1026,7 +1026,7 @@ assert(call); - + futex_down(&async_futex); - + ht_link_t *link = hash_table_find(¬ification_hash_table, &IPC_GET_IMETHOD(*call)); @@ -1037,7 +1037,7 @@ data = notification->data; } - + futex_up(&async_futex); - + if (handler) handler(call, data); @@ -1063,18 +1063,18 @@ if (!notification) return ENOMEM; - + futex_down(&async_futex); - + sysarg_t imethod = notification_avail; notification_avail++; - + notification->imethod = imethod; notification->handler = handler; notification->data = data; - + hash_table_insert(¬ification_hash_table, ¬ification->link); - + futex_up(&async_futex); - + cap_handle_t cap; errno_t rc = ipc_irq_subscribe(inr, imethod, ucode, &cap); @@ -1096,5 +1096,5 @@ // TODO: Remove entry from hash table // to avoid memory leak - + return ipc_irq_unsubscribe(cap); } @@ -1116,18 +1116,18 @@ if (!notification) return ENOMEM; - + futex_down(&async_futex); - + sysarg_t imethod = notification_avail; notification_avail++; - + notification->imethod = imethod; notification->handler = handler; notification->data = data; - + hash_table_insert(¬ification_hash_table, ¬ification->link); - + futex_up(&async_futex); - + return ipc_event_subscribe(evno, imethod); } @@ -1149,18 +1149,18 @@ if (!notification) return ENOMEM; - + futex_down(&async_futex); - + sysarg_t imethod = notification_avail; notification_avail++; - + notification->imethod = imethod; notification->handler = handler; notification->data = data; - + hash_table_insert(¬ification_hash_table, ¬ification->link); - + futex_up(&async_futex); - + return ipc_event_task_subscribe(evno, imethod); } @@ -1204,5 +1204,5 @@ assert(call); assert(fibril_connection); - + /* Why doing this? * GCC 4.1.0 coughs on fibril_connection-> dereference. @@ -1212,7 +1212,7 @@ */ connection_t *conn = fibril_connection; - + futex_down(&async_futex); - + if (usecs) { getuptime(&conn->wdata.to_event.expires); @@ -1220,5 +1220,5 @@ } else conn->wdata.to_event.inlist = false; - + /* If nothing in queue, wait until something arrives */ while (list_empty(&conn->msg_queue)) { @@ -1236,10 +1236,10 @@ return conn->close_chandle; } - + if (usecs) async_insert_timeout(&conn->wdata); - + conn->wdata.active = false; - + /* * Note: the current fibril will be rescheduled either due to a @@ -1249,5 +1249,5 @@ */ fibril_switch(FIBRIL_TO_MANAGER); - + /* * Futex is up after getting back from async_manager. @@ -1262,13 +1262,13 @@ } } - + msg_t *msg = list_get_instance(list_first(&conn->msg_queue), msg_t, link); list_remove(&msg->link); - + cap_handle_t chandle = msg->chandle; *call = msg->call; free(msg); - + futex_up(&async_futex); return chandle; @@ -1286,10 +1286,10 @@ if (!client) return NULL; - + if (!client->data) { async_client_put(client); return NULL; } - + return client->data; } @@ -1298,11 +1298,11 @@ { client_t *client = async_client_get(client_id, false); - + assert(client); assert(client->data); - + /* Drop the reference we got in async_get_client_data_by_hash(). */ async_client_put(client); - + /* Drop our own reference we got at the beginning of this function. */ async_client_put(client); @@ -1312,19 +1312,19 @@ { port_t *port = NULL; - + futex_down(&async_futex); - + ht_link_t *link = hash_table_find(&interface_hash_table, &iface); if (link) { interface_t *interface = hash_table_get_inst(link, interface_t, link); - + link = hash_table_find(&interface->port_hash_table, &port_id); if (link) port = hash_table_get_inst(link, port_t, link); } - + futex_up(&async_futex); - + return port; } @@ -1342,12 +1342,12 @@ { assert(call); - + /* Kernel notification */ if ((chandle == CAP_NIL) && (call->flags & IPC_CALL_NOTIF)) { fibril_t *fibril = (fibril_t *) __tcb_get()->fibril_data; unsigned oldsw = fibril->switches; - + process_notification(call); - + if (oldsw != fibril->switches) { /* @@ -1365,16 +1365,16 @@ fibril_switch(FIBRIL_FROM_DEAD); } - + return; } - + /* New connection */ if (IPC_GET_IMETHOD(*call) == IPC_M_CONNECT_ME_TO) { iface_t iface = (iface_t) IPC_GET_ARG1(*call); sysarg_t in_phone_hash = IPC_GET_ARG5(*call); - + async_port_handler_t handler = fallback_port_handler; void *data = fallback_port_data; - + // TODO: Currently ignores all ports but the first one port_t *port = async_find_port(iface, 0); @@ -1383,14 +1383,14 @@ data = port->data; } - + async_new_connection(call->in_task_id, in_phone_hash, chandle, call, handler, data); return; } - + /* Try to route the call through the connection hash table */ if (route_call(chandle, call)) return; - + /* Unknown call from unknown phone - hang it up */ ipc_answer_0(chandle, EHANGUP); @@ -1402,19 +1402,19 @@ struct timeval tv; getuptime(&tv); - + futex_down(&async_futex); - + link_t *cur = list_first(&timeout_list); while (cur != NULL) { awaiter_t *waiter = list_get_instance(cur, awaiter_t, to_event.link); - + if (tv_gt(&waiter->to_event.expires, &tv)) break; - + list_remove(&waiter->to_event.link); waiter->to_event.inlist = false; waiter->to_event.occurred = true; - + /* * Redundant condition? @@ -1425,8 +1425,8 @@ fibril_add_ready(waiter->fid); } - + cur = list_first(&timeout_list); } - + futex_up(&async_futex); } @@ -1448,7 +1448,7 @@ continue; } - + futex_down(&async_futex); - + suseconds_t timeout; unsigned int flags = SYNCH_FLAGS_NONE; @@ -1456,8 +1456,8 @@ awaiter_t *waiter = list_get_instance( list_first(&timeout_list), awaiter_t, to_event.link); - + struct timeval tv; getuptime(&tv); - + if (tv_gteq(&tv, &waiter->to_event.expires)) { futex_up(&async_futex); @@ -1485,12 +1485,12 @@ timeout = SYNCH_NO_TIMEOUT; } - + atomic_inc(&threads_in_ipc_wait); - + ipc_call_t call; errno_t rc = ipc_wait_cycle(&call, timeout, flags); - + atomic_dec(&threads_in_ipc_wait); - + assert(rc == EOK); @@ -1524,10 +1524,10 @@ { futex_up(&async_futex); - + /* * async_futex is always locked when entering manager */ async_manager_worker(); - + return 0; } @@ -1555,19 +1555,19 @@ &interface_hash_table_ops)) abort(); - + if (!hash_table_create(&client_hash_table, 0, 0, &client_hash_table_ops)) abort(); - + if (!hash_table_create(&conn_hash_table, 0, 0, &conn_hash_table_ops)) abort(); - + if (!hash_table_create(¬ification_hash_table, 0, 0, ¬ification_hash_table_ops)) abort(); - + session_ns = (async_sess_t *) malloc(sizeof(async_sess_t)); if (session_ns == NULL) abort(); - + session_ns->iface = 0; session_ns->mgmt = EXCHANGE_ATOMIC; @@ -1576,8 +1576,8 @@ session_ns->arg2 = 0; session_ns->arg3 = 0; - + fibril_mutex_initialize(&session_ns->remote_state_mtx); session_ns->remote_state_data = NULL; - + list_initialize(&session_ns->exch_list); fibril_mutex_initialize(&session_ns->mutex); @@ -1600,22 +1600,22 @@ { assert(arg); - + futex_down(&async_futex); - + amsg_t *msg = (amsg_t *) arg; msg->retval = retval; - + /* Copy data after futex_down, just in case the call was detached */ if ((msg->dataptr) && (data)) *msg->dataptr = *data; - + write_barrier(); - + /* Remove message from timeout list */ if (msg->wdata.to_event.inlist) list_remove(&msg->wdata.to_event.link); - + msg->done = true; - + if (msg->forget) { assert(msg->wdata.active); @@ -1625,5 +1625,5 @@ fibril_add_ready(msg->wdata.fid); } - + futex_up(&async_futex); } @@ -1650,15 +1650,15 @@ if (exch == NULL) return 0; - + amsg_t *msg = amsg_create(); if (msg == NULL) return 0; - + msg->dataptr = dataptr; msg->wdata.active = true; - + ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, arg4, msg, reply_received); - + return (aid_t) msg; } @@ -1688,15 +1688,15 @@ if (exch == NULL) return 0; - + amsg_t *msg = amsg_create(); if (msg == NULL) return 0; - + msg->dataptr = dataptr; msg->wdata.active = true; - + ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, arg4, arg5, msg, reply_received); - + return (aid_t) msg; } @@ -1712,30 +1712,30 @@ { assert(amsgid); - + amsg_t *msg = (amsg_t *) amsgid; - + futex_down(&async_futex); - + assert(!msg->forget); assert(!msg->destroyed); - + if (msg->done) { futex_up(&async_futex); goto done; } - + msg->wdata.fid = fibril_get_id(); msg->wdata.active = false; msg->wdata.to_event.inlist = false; - + /* Leave the async_futex locked when entering this function */ fibril_switch(FIBRIL_TO_MANAGER); - + /* Futex is up automatically after fibril_switch */ - + done: if (retval) *retval = msg->retval; - + amsg_destroy(msg); } @@ -1758,17 +1758,17 @@ { assert(amsgid); - + amsg_t *msg = (amsg_t *) amsgid; - + futex_down(&async_futex); - + assert(!msg->forget); assert(!msg->destroyed); - + if (msg->done) { futex_up(&async_futex); goto done; } - + /* * Negative timeout is converted to zero timeout to avoid @@ -1777,8 +1777,8 @@ if (timeout < 0) timeout = 0; - + getuptime(&msg->wdata.to_event.expires); tv_add_diff(&msg->wdata.to_event.expires, timeout); - + /* * Current fibril is inserted as waiting regardless of the @@ -1801,22 +1801,22 @@ msg->wdata.active = false; async_insert_timeout(&msg->wdata); - + /* Leave the async_futex locked when entering this function */ fibril_switch(FIBRIL_TO_MANAGER); - + /* Futex is up automatically after fibril_switch */ - + if (!msg->done) return ETIMEOUT; - + done: if (retval) *retval = msg->retval; - + amsg_destroy(msg); - + return 0; } - + /** Discard the message / reply on arrival. * @@ -1830,11 +1830,11 @@ { amsg_t *msg = (amsg_t *) amsgid; - + assert(msg); assert(!msg->forget); assert(!msg->destroyed); - + futex_down(&async_futex); - + if (msg->done) { amsg_destroy(msg); @@ -1843,5 +1843,5 @@ msg->forget = true; } - + futex_up(&async_futex); } @@ -1858,17 +1858,17 @@ awaiter_t awaiter; awaiter_initialize(&awaiter); - + awaiter.fid = fibril_get_id(); - + getuptime(&awaiter.to_event.expires); tv_add_diff(&awaiter.to_event.expires, timeout); - + futex_down(&async_futex); - + async_insert_timeout(&awaiter); - + /* Leave the async_futex locked when entering this function */ fibril_switch(FIBRIL_TO_MANAGER); - + /* Futex is up automatically after fibril_switch() */ } @@ -1921,27 +1921,27 @@ if (exch == NULL) return ENOENT; - + ipc_call_t result; aid_t aid = async_send_4(exch, imethod, arg1, arg2, arg3, arg4, &result); - + errno_t rc; async_wait_for(aid, &rc); - + if (r1) *r1 = IPC_GET_ARG1(result); - + if (r2) *r2 = IPC_GET_ARG2(result); - + if (r3) *r3 = IPC_GET_ARG3(result); - + if (r4) *r4 = IPC_GET_ARG4(result); - + if (r5) *r5 = IPC_GET_ARG5(result); - + return rc; } @@ -1973,27 +1973,27 @@ if (exch == NULL) return ENOENT; - + ipc_call_t result; aid_t aid = async_send_5(exch, imethod, arg1, arg2, arg3, arg4, arg5, &result); - + errno_t rc; async_wait_for(aid, &rc); - + if (r1) *r1 = IPC_GET_ARG1(result); - + if (r2) *r2 = IPC_GET_ARG2(result); - + if (r3) *r3 = IPC_GET_ARG3(result); - + if (r4) *r4 = IPC_GET_ARG4(result); - + if (r5) *r5 = IPC_GET_ARG5(result); - + return rc; } @@ -2081,5 +2081,5 @@ if (exch == NULL) return ENOENT; - + return ipc_forward_fast(chandle, exch->phone, imethod, arg1, arg2, mode); } @@ -2091,5 +2091,5 @@ if (exch == NULL) return ENOENT; - + return ipc_forward_slow(chandle, exch->phone, imethod, arg1, arg2, arg3, arg4, arg5, mode); @@ -2113,14 +2113,14 @@ if (exch == NULL) return ENOENT; - + ipc_call_t answer; aid_t req = async_send_3(exch, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3, &answer); - + errno_t rc; async_wait_for(req, &rc); if (rc != EOK) return (errno_t) rc; - + return EOK; } @@ -2130,25 +2130,25 @@ { ipc_call_t result; - + // XXX: Workaround for GCC's inability to infer association between // rc == EOK and *out_phone being assigned. *out_phone = -1; - + amsg_t *msg = amsg_create(); if (!msg) return ENOENT; - + msg->dataptr = &result; msg->wdata.active = true; - + ipc_call_async_4(phone, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3, arg4, msg, reply_received); - + errno_t rc; async_wait_for((aid_t) msg, &rc); - + if (rc != EOK) return rc; - + *out_phone = (int) IPC_GET_ARG5(result); return EOK; @@ -2175,5 +2175,5 @@ return NULL; } - + async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t)); if (sess == NULL) { @@ -2181,5 +2181,5 @@ return NULL; } - + int phone; errno_t rc = async_connect_me_to_internal(exch->phone, arg1, arg2, arg3, @@ -2190,5 +2190,5 @@ return NULL; } - + sess->iface = 0; sess->mgmt = mgmt; @@ -2197,12 +2197,12 @@ sess->arg2 = arg2; sess->arg3 = arg3; - + fibril_mutex_initialize(&sess->remote_state_mtx); sess->remote_state_data = NULL; - + list_initialize(&sess->exch_list); fibril_mutex_initialize(&sess->mutex); atomic_set(&sess->refcnt, 0); - + return sess; } @@ -2228,5 +2228,5 @@ return NULL; } - + async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t)); if (sess == NULL) { @@ -2234,5 +2234,5 @@ return NULL; } - + int phone; errno_t rc = async_connect_me_to_internal(exch->phone, iface, arg2, @@ -2243,5 +2243,5 @@ return NULL; } - + sess->iface = iface; sess->phone = phone; @@ -2249,12 +2249,12 @@ sess->arg2 = arg2; sess->arg3 = arg3; - + fibril_mutex_initialize(&sess->remote_state_mtx); sess->remote_state_data = NULL; - + list_initialize(&sess->exch_list); fibril_mutex_initialize(&sess->mutex); atomic_set(&sess->refcnt, 0); - + return sess; } @@ -2299,5 +2299,5 @@ return NULL; } - + async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t)); if (sess == NULL) { @@ -2305,9 +2305,9 @@ return NULL; } - + int phone; errno_t rc = async_connect_me_to_internal(exch->phone, arg1, arg2, arg3, IPC_FLAG_BLOCKING, &phone); - + if (rc != EOK) { errno = rc; @@ -2315,5 +2315,5 @@ return NULL; } - + sess->iface = 0; sess->mgmt = mgmt; @@ -2322,12 +2322,12 @@ sess->arg2 = arg2; sess->arg3 = arg3; - + fibril_mutex_initialize(&sess->remote_state_mtx); sess->remote_state_data = NULL; - + list_initialize(&sess->exch_list); fibril_mutex_initialize(&sess->mutex); atomic_set(&sess->refcnt, 0); - + return sess; } @@ -2353,5 +2353,5 @@ return NULL; } - + async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t)); if (sess == NULL) { @@ -2359,5 +2359,5 @@ return NULL; } - + int phone; errno_t rc = async_connect_me_to_internal(exch->phone, iface, arg2, @@ -2368,5 +2368,5 @@ return NULL; } - + sess->iface = iface; sess->phone = phone; @@ -2374,12 +2374,12 @@ sess->arg2 = arg2; sess->arg3 = arg3; - + fibril_mutex_initialize(&sess->remote_state_mtx); sess->remote_state_data = NULL; - + list_initialize(&sess->exch_list); fibril_mutex_initialize(&sess->mutex); atomic_set(&sess->refcnt, 0); - + return sess; } @@ -2395,5 +2395,5 @@ return NULL; } - + cap_handle_t phone; errno_t rc = ipc_connect_kbox(id, &phone); @@ -2403,5 +2403,5 @@ return NULL; } - + sess->iface = 0; sess->mgmt = EXCHANGE_ATOMIC; @@ -2410,12 +2410,12 @@ sess->arg2 = 0; sess->arg3 = 0; - + fibril_mutex_initialize(&sess->remote_state_mtx); sess->remote_state_data = NULL; - + list_initialize(&sess->exch_list); fibril_mutex_initialize(&sess->mutex); atomic_set(&sess->refcnt, 0); - + return sess; } @@ -2436,19 +2436,19 @@ { async_exch_t *exch; - + assert(sess); - + if (atomic_get(&sess->refcnt) > 0) return EBUSY; - + fibril_mutex_lock(&async_sess_mutex); - + errno_t rc = async_hangup_internal(sess->phone); - + while (!list_empty(&sess->exch_list)) { exch = (async_exch_t *) list_get_instance(list_first(&sess->exch_list), async_exch_t, sess_link); - + list_remove(&exch->sess_link); list_remove(&exch->global_link); @@ -2458,7 +2458,7 @@ free(sess); - + fibril_mutex_unlock(&async_sess_mutex); - + return rc; } @@ -2481,13 +2481,13 @@ if (sess == NULL) return NULL; - + exch_mgmt_t mgmt = sess->mgmt; if (sess->iface != 0) mgmt = sess->iface & IFACE_EXCHANGE_MASK; - + async_exch_t *exch = NULL; - + fibril_mutex_lock(&async_sess_mutex); - + if (!list_empty(&sess->exch_list)) { /* @@ -2497,5 +2497,5 @@ list_get_instance(list_first(&sess->exch_list), async_exch_t, sess_link); - + list_remove(&exch->sess_link); list_remove(&exch->global_link); @@ -2504,5 +2504,5 @@ * There are no available exchanges in the session. */ - + if ((mgmt == EXCHANGE_ATOMIC) || (mgmt == EXCHANGE_SERIALIZE)) { @@ -2517,5 +2517,5 @@ int phone; errno_t rc; - + retry: /* @@ -2542,5 +2542,5 @@ list_get_instance(list_first(&inactive_exch_list), async_exch_t, global_link); - + list_remove(&exch->sess_link); list_remove(&exch->global_link); @@ -2557,14 +2557,14 @@ } } - + fibril_mutex_unlock(&async_sess_mutex); - + if (exch != NULL) { atomic_inc(&sess->refcnt); - + if (mgmt == EXCHANGE_SERIALIZE) fibril_mutex_lock(&sess->mutex); } - + return exch; } @@ -2579,23 +2579,23 @@ if (exch == NULL) return; - + async_sess_t *sess = exch->sess; assert(sess != NULL); - + exch_mgmt_t mgmt = sess->mgmt; if (sess->iface != 0) mgmt = sess->iface & IFACE_EXCHANGE_MASK; - + atomic_dec(&sess->refcnt); - + if (mgmt == EXCHANGE_SERIALIZE) fibril_mutex_unlock(&sess->mutex); - + fibril_mutex_lock(&async_sess_mutex); - + list_append(&exch->sess_link, &sess->exch_list); list_append(&exch->global_link, &inactive_exch_list); fibril_condvar_signal(&avail_phone_cv); - + fibril_mutex_unlock(&async_sess_mutex); } @@ -2618,13 +2618,13 @@ if (exch == NULL) return ENOENT; - + sysarg_t _flags = 0; sysarg_t _dst = (sysarg_t) -1; errno_t res = async_req_2_4(exch, IPC_M_SHARE_IN, (sysarg_t) size, arg, NULL, &_flags, NULL, &_dst); - + if (flags) *flags = (unsigned int) _flags; - + *dst = (void *) _dst; return res; @@ -2649,11 +2649,11 @@ assert(chandle); assert(size); - + ipc_call_t data; *chandle = async_get_call(&data); - + if (IPC_GET_IMETHOD(data) != IPC_M_SHARE_IN) return false; - + *size = (size_t) IPC_GET_ARG1(data); return true; @@ -2692,5 +2692,5 @@ if (exch == NULL) return ENOENT; - + return async_req_3_0(exch, IPC_M_SHARE_OUT, (sysarg_t) src, 0, (sysarg_t) flags); @@ -2718,11 +2718,11 @@ assert(size); assert(flags); - + ipc_call_t data; *chandle = async_get_call(&data); - + if (IPC_GET_IMETHOD(data) != IPC_M_SHARE_OUT) return false; - + *size = (size_t) IPC_GET_ARG2(data); *flags = (unsigned int) IPC_GET_ARG3(data); @@ -2778,5 +2778,5 @@ if (exch == NULL) return ENOENT; - + return async_req_2_0(exch, IPC_M_DATA_READ, (sysarg_t) dst, (sysarg_t) size); @@ -2822,13 +2822,13 @@ assert(chandle); assert(data); - + *chandle = async_get_call(data); - + if (IPC_GET_IMETHOD(*data) != IPC_M_DATA_READ) return false; - + if (size) *size = (size_t) IPC_GET_ARG2(*data); - + return true; } @@ -2862,5 +2862,5 @@ if (exch == NULL) return ENOENT; - + cap_handle_t chandle; if (!async_data_read_receive(&chandle, NULL)) { @@ -2868,5 +2868,5 @@ return EINVAL; } - + aid_t msg = async_send_fast(exch, imethod, arg1, arg2, arg3, arg4, dataptr); @@ -2875,5 +2875,5 @@ return EINVAL; } - + errno_t retval = ipc_forward_fast(chandle, exch->phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); @@ -2883,8 +2883,8 @@ return retval; } - + errno_t rc; async_wait_for(msg, &rc); - + return (errno_t) rc; } @@ -2903,5 +2903,5 @@ if (exch == NULL) return ENOENT; - + return async_req_2_0(exch, IPC_M_DATA_WRITE, (sysarg_t) src, (sysarg_t) size); @@ -2948,13 +2948,13 @@ assert(chandle); assert(data); - + *chandle = async_get_call(data); - + if (IPC_GET_IMETHOD(*data) != IPC_M_DATA_WRITE) return false; - + if (size) *size = (size_t) IPC_GET_ARG2(*data); - + return true; } @@ -3004,5 +3004,5 @@ { assert(data); - + cap_handle_t chandle; size_t size; @@ -3011,32 +3011,32 @@ return EINVAL; } - + if (size < min_size) { ipc_answer_0(chandle, EINVAL); return EINVAL; } - + if ((max_size > 0) && (size > max_size)) { ipc_answer_0(chandle, EINVAL); return EINVAL; } - + if ((granularity > 0) && ((size % granularity) != 0)) { ipc_answer_0(chandle, EINVAL); return EINVAL; } - + void *arg_data; - + if (nullterm) arg_data = malloc(size + 1); else arg_data = malloc(size); - + if (arg_data == NULL) { ipc_answer_0(chandle, ENOMEM); return ENOMEM; } - + errno_t rc = async_data_write_finalize(chandle, arg_data, size); if (rc != EOK) { @@ -3044,12 +3044,12 @@ return rc; } - + if (nullterm) ((char *) arg_data)[size] = 0; - + *data = arg_data; if (received != NULL) *received = size; - + return EOK; } @@ -3078,5 +3078,5 @@ if (exch == NULL) return ENOENT; - + cap_handle_t chandle; if (!async_data_write_receive(&chandle, NULL)) { @@ -3084,5 +3084,5 @@ return EINVAL; } - + aid_t msg = async_send_fast(exch, imethod, arg1, arg2, arg3, arg4, dataptr); @@ -3091,5 +3091,5 @@ return EINVAL; } - + errno_t retval = ipc_forward_fast(chandle, exch->phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); @@ -3099,8 +3099,8 @@ return retval; } - + errno_t rc; async_wait_for(msg, &rc); - + return (errno_t) rc; } @@ -3123,10 +3123,10 @@ cap_handle_t chandle = async_get_call(&call); cap_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(call); - + if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) || (phandle < 0)) { async_answer_0(chandle, EINVAL); return NULL; } - + async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t)); if (sess == NULL) { @@ -3134,5 +3134,5 @@ return NULL; } - + sess->iface = 0; sess->mgmt = mgmt; @@ -3141,15 +3141,15 @@ sess->arg2 = 0; sess->arg3 = 0; - + fibril_mutex_initialize(&sess->remote_state_mtx); sess->remote_state_data = NULL; - + list_initialize(&sess->exch_list); fibril_mutex_initialize(&sess->mutex); atomic_set(&sess->refcnt, 0); - + /* Acknowledge the connected phone */ async_answer_0(chandle, EOK); - + return sess; } @@ -3172,12 +3172,12 @@ { cap_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(*call); - + if ((IPC_GET_IMETHOD(*call) != IPC_M_CONNECT_TO_ME) || (phandle < 0)) return NULL; - + async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t)); if (sess == NULL) return NULL; - + sess->iface = 0; sess->mgmt = mgmt; @@ -3186,12 +3186,12 @@ sess->arg2 = 0; sess->arg3 = 0; - + fibril_mutex_initialize(&sess->remote_state_mtx); sess->remote_state_data = NULL; - + list_initialize(&sess->exch_list); fibril_mutex_initialize(&sess->mutex); atomic_set(&sess->refcnt, 0); - + return sess; } @@ -3208,11 +3208,11 @@ { assert(chandle); - + ipc_call_t call; *chandle = async_get_call(&call); - + if (IPC_GET_IMETHOD(call) != IPC_M_STATE_CHANGE_AUTHORIZE) return false; - + if (arg1) *arg1 = IPC_GET_ARG1(call); @@ -3221,5 +3221,5 @@ if (arg3) *arg3 = IPC_GET_ARG3(call); - + return true; } @@ -3274,5 +3274,5 @@ { assert(fibril_mutex_is_locked(&sess->remote_state_mtx)); - + fibril_mutex_unlock(&sess->remote_state_mtx); } @@ -3292,8 +3292,8 @@ if (exch == NULL) return; - + async_sess_t *sess = exch->sess; assert(fibril_mutex_is_locked(&sess->remote_state_mtx)); - + async_exchange_end(exch); fibril_mutex_unlock(&sess->remote_state_mtx); Index: uspace/lib/c/generic/bd.c =================================================================== --- uspace/lib/c/generic/bd.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/bd.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -53,25 +53,25 @@ if (bd == NULL) return ENOMEM; - + bd->sess = sess; - + async_exch_t *exch = async_exchange_begin(sess); - + port_id_t port; errno_t rc = async_create_callback_port(exch, INTERFACE_BLOCK_CB, 0, 0, bd_cb_conn, bd, &port); - - async_exchange_end(exch); - + + async_exchange_end(exch); + if (rc != EOK) goto error; - + *rbd = bd; return EOK; - + error: if (bd != NULL) free(bd); - + return rc; } Index: uspace/lib/c/generic/clipboard.c =================================================================== --- uspace/lib/c/generic/clipboard.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/clipboard.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -60,7 +60,7 @@ service_id_t sid; errno_t rc; - + fibril_mutex_lock(&clip_mutex); - + while (clip_sess == NULL) { rc = loc_service_get_id(SERVICE_NAME_CLIPBOARD, &sid, @@ -68,11 +68,11 @@ if (rc != EOK) continue; - + clip_sess = loc_service_connect(sid, INTERFACE_CLIPBOARD, IPC_FLAG_BLOCKING); } - + fibril_mutex_unlock(&clip_mutex); - + return async_exchange_begin(clip_sess); } @@ -101,5 +101,5 @@ { size_t size = str_size(str); - + if (size == 0) { async_exch_t *exch = clip_exchange_begin(); @@ -107,5 +107,5 @@ CLIPBOARD_TAG_NONE); clip_exchange_end(exch); - + return (errno_t) rc; } else { @@ -115,5 +115,5 @@ errno_t rc = async_data_write_start(exch, (void *) str, size); clip_exchange_end(exch); - + if (rc != EOK) { errno_t rc_orig; @@ -124,7 +124,7 @@ return (errno_t) rc_orig; } - + async_wait_for(req, &rc); - + return (errno_t) rc; } @@ -145,16 +145,16 @@ while (true) { async_exch_t *exch = clip_exchange_begin(); - + sysarg_t size; sysarg_t tag; errno_t rc = async_req_0_2(exch, CLIPBOARD_CONTENT, &size, &tag); - + clip_exchange_end(exch); - + if (rc != EOK) return (errno_t) rc; - + char *sbuf; - + switch (tag) { case CLIPBOARD_TAG_NONE: @@ -162,5 +162,5 @@ if (sbuf == NULL) return ENOMEM; - + sbuf[0] = 0; *str = sbuf; @@ -170,10 +170,10 @@ if (sbuf == NULL) return ENOMEM; - + exch = clip_exchange_begin(); aid_t req = async_send_1(exch, CLIPBOARD_GET_DATA, tag, NULL); rc = async_data_read_start(exch, (void *) sbuf, size); clip_exchange_end(exch); - + if ((errno_t) rc == EOVERFLOW) { /* @@ -183,5 +183,5 @@ break; } - + if (rc != EOK) { errno_t rc_orig; @@ -192,12 +192,12 @@ return (errno_t) rc_orig; } - + async_wait_for(req, &rc); - + if (rc == EOK) { sbuf[size] = 0; *str = sbuf; } - + return rc; default: Index: uspace/lib/c/generic/ddi.c =================================================================== --- uspace/lib/c/generic/ddi.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/ddi.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -142,5 +142,5 @@ { *phys = constraint; - + return (errno_t) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size, (sysarg_t) map_flags, (sysarg_t) flags | DMAMEM_FLAGS_ANONYMOUS, @@ -180,5 +180,5 @@ .size = size }; - + return (errno_t) __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg); } @@ -204,5 +204,5 @@ .size = size }; - + return (errno_t) __SYSCALL1(SYS_IOSPACE_DISABLE, (sysarg_t) &arg); } @@ -284,10 +284,10 @@ if (!virt) return EINVAL; - + uintptr_t phys_frame = ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE); size_t offset = (uintptr_t) pio_addr - phys_frame; size_t pages = SIZE2PAGES(offset + size); - + void *virt_page = AS_AREA_ANY; errno_t rc = physmem_map(phys_frame, pages, @@ -295,5 +295,5 @@ if (rc != EOK) return rc; - + *virt = virt_page + offset; return EOK; Index: uspace/lib/c/generic/device/hw_res.c =================================================================== --- uspace/lib/c/generic/device/hw_res.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/device/hw_res.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -42,15 +42,15 @@ { sysarg_t count = 0; - + async_exch_t *exch = async_exchange_begin(sess); - + errno_t rc = async_req_1_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE), HW_RES_GET_RESOURCE_LIST, &count); - + if (rc != EOK) { async_exchange_end(exch); return rc; } - + size_t size = count * sizeof(hw_resource_t); hw_resource_t *resources = (hw_resource_t *) malloc(size); @@ -60,16 +60,16 @@ return ENOMEM; } - + rc = async_data_read_start(exch, resources, size); async_exchange_end(exch); - + if (rc != EOK) { free(resources); return rc; } - + hw_resources->resources = resources; hw_resources->count = count; - + return EOK; } @@ -78,9 +78,9 @@ { async_exch_t *exch = async_exchange_begin(sess); - + errno_t rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE), HW_RES_ENABLE_INTERRUPT, irq); async_exchange_end(exch); - + return rc; } @@ -89,9 +89,9 @@ { async_exch_t *exch = async_exchange_begin(sess); - + errno_t rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE), HW_RES_DISABLE_INTERRUPT, irq); async_exchange_end(exch); - + return rc; } @@ -100,9 +100,9 @@ { async_exch_t *exch = async_exchange_begin(sess); - + errno_t rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE), HW_RES_CLEAR_INTERRUPT, irq); async_exchange_end(exch); - + return rc; } @@ -126,11 +126,11 @@ { async_exch_t *exch = async_exchange_begin(sess); - + const uint32_t packed = (channel & 0xffff) | (mode << 16); const errno_t ret = async_req_4_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE), HW_RES_DMA_CHANNEL_SETUP, packed, pa, size); - + async_exchange_end(exch); - + return ret; } @@ -148,14 +148,14 @@ { async_exch_t *exch = async_exchange_begin(sess); - + sysarg_t remain; const errno_t ret = async_req_2_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE), HW_RES_DMA_CHANNEL_REMAIN, channel, &remain); - + async_exchange_end(exch); - + if (ret == EOK) *rem = remain; - + return ret; } Index: uspace/lib/c/generic/device/hw_res_parsed.c =================================================================== --- uspace/lib/c/generic/device/hw_res_parsed.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/device/hw_res_parsed.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -43,10 +43,10 @@ assert(res); assert((res->type == DMA_CHANNEL_8) || (res->type == DMA_CHANNEL_16)); - + const unsigned channel = (res->type == DMA_CHANNEL_8) ? res->res.dma_channel.dma8 : res->res.dma_channel.dma16; const size_t count = out->dma_channels.count; const int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT; - + if (!keep_duplicit) { for (size_t i = 0; i < count; ++i) { @@ -55,5 +55,5 @@ } } - + out->dma_channels.channels[count] = channel; ++out->dma_channels.count; @@ -64,9 +64,9 @@ { assert(res && (res->type == INTERRUPT)); - + int irq = res->res.interrupt.irq; size_t count = out->irqs.count; int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT; - + if (!keep_duplicit) { for (size_t i = 0; i < count; i++) { @@ -75,5 +75,5 @@ } } - + out->irqs.irqs[count] = irq; out->irqs.count++; @@ -105,5 +105,5 @@ assert(res && (res->type == IO_RANGE)); - + absolute = absolutize(res->res.io_range.address, res->res.io_range.relative, win->io.base); @@ -112,11 +112,11 @@ size = res->res.io_range.size; endianness = res->res.io_range.endianness; - + if ((size == 0) && (!(flags & HW_RES_KEEP_ZERO_AREA))) return; - + int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT; size_t count = out->io_ranges.count; - + if (!keep_duplicit) { for (size_t i = 0; i < count; i++) { @@ -126,10 +126,10 @@ s_address = RNGABS(out->io_ranges.ranges[i]); s_size = RNGSZ(out->io_ranges.ranges[i]); - + if ((absolute == s_address) && (size == s_size)) return; } } - + RNGABS(out->io_ranges.ranges[count]) = absolute; RNGREL(out->io_ranges.ranges[count]) = relative; @@ -146,7 +146,7 @@ uint64_t relative; size_t size; - + assert(res && (res->type == MEM_RANGE)); - + absolute = absolutize(res->res.mem_range.address, res->res.mem_range.relative, win->mem.base); @@ -155,11 +155,11 @@ size = res->res.mem_range.size; endianness = res->res.mem_range.endianness; - + if ((size == 0) && (!(flags & HW_RES_KEEP_ZERO_AREA))) return; - + int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT; size_t count = out->mem_ranges.count; - + if (!keep_duplicit) { for (size_t i = 0; i < count; ++i) { @@ -169,10 +169,10 @@ s_address = RNGABS(out->mem_ranges.ranges[i]);; s_size = RNGSZ(out->mem_ranges.ranges[i]); - + if ((absolute == s_address) && (size == s_size)) return; } } - + RNGABS(out->mem_ranges.ranges[count]) = absolute; RNGREL(out->mem_ranges.ranges[count]) = relative; @@ -199,8 +199,8 @@ if (!res || !out) return EINVAL; - + size_t res_count = res->count; hw_res_list_parsed_clean(out); - + out->irqs.irqs = calloc(res_count, sizeof(int)); out->dma_channels.channels = calloc(res_count, sizeof(int)); @@ -212,8 +212,8 @@ return ENOMEM; } - + for (size_t i = 0; i < res_count; ++i) { const hw_resource_t *resource = &res->resources[i]; - + switch (resource->type) { case INTERRUPT: @@ -235,5 +235,5 @@ } } - + return EOK; }; @@ -261,5 +261,5 @@ if (!hw_res_parsed) return EBADMEM; - + hw_resource_list_t hw_resources; hw_res_list_parsed_clean(hw_res_parsed); @@ -269,5 +269,5 @@ if (rc != EOK) return rc; - + rc = hw_res_get_resource_list(sess, &hw_resources); if (rc != EOK) @@ -277,5 +277,5 @@ flags); hw_res_clean_resource_list(&hw_resources); - + return rc; }; Index: uspace/lib/c/generic/device/led_dev.c =================================================================== --- uspace/lib/c/generic/device/led_dev.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/device/led_dev.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -42,13 +42,13 @@ { async_exch_t *exch = async_exchange_begin(sess); - + aid_t req = async_send_2(exch, DEV_IFACE_ID(LED_DEV_IFACE), LED_DEV_COLOR_SET, (sysarg_t) pixel, NULL); - + async_exchange_end(exch); - + errno_t rc; async_wait_for(req, &rc); - + return (errno_t) rc; } Index: uspace/lib/c/generic/device/pio_window.c =================================================================== --- uspace/lib/c/generic/device/pio_window.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/device/pio_window.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -51,8 +51,8 @@ return rc; } - + rc = async_data_read_start(exch, pio_win, sizeof(*pio_win)); async_exchange_end(exch); - + return rc; } Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/devman.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -62,8 +62,8 @@ { fibril_mutex_lock(mtx); - + if ((*dst == NULL) && (src != NULL)) *dst = src; - + fibril_mutex_unlock(mtx); } @@ -81,9 +81,9 @@ case INTERFACE_DDF_DRIVER: fibril_mutex_lock(&devman_driver_block_mutex); - + while (devman_driver_block_sess == NULL) { clone_session(&devman_driver_mutex, devman_driver_sess, &devman_driver_block_sess); - + if (devman_driver_block_sess == NULL) devman_driver_block_sess = @@ -91,18 +91,18 @@ INTERFACE_DDF_DRIVER, 0); } - + fibril_mutex_unlock(&devman_driver_block_mutex); - + clone_session(&devman_driver_mutex, devman_driver_block_sess, &devman_driver_sess); - + return async_exchange_begin(devman_driver_block_sess); case INTERFACE_DDF_CLIENT: fibril_mutex_lock(&devman_client_block_mutex); - + while (devman_client_block_sess == NULL) { clone_session(&devman_client_mutex, devman_client_sess, &devman_client_block_sess); - + if (devman_client_block_sess == NULL) devman_client_block_sess = @@ -110,10 +110,10 @@ INTERFACE_DDF_CLIENT, 0); } - + fibril_mutex_unlock(&devman_client_block_mutex); - + clone_session(&devman_client_mutex, devman_client_block_sess, &devman_client_sess); - + return async_exchange_begin(devman_client_block_sess); default: @@ -134,29 +134,29 @@ case INTERFACE_DDF_DRIVER: fibril_mutex_lock(&devman_driver_mutex); - + if (devman_driver_sess == NULL) devman_driver_sess = service_connect(SERVICE_DEVMAN, INTERFACE_DDF_DRIVER, 0); - + fibril_mutex_unlock(&devman_driver_mutex); - + if (devman_driver_sess == NULL) return NULL; - + return async_exchange_begin(devman_driver_sess); case INTERFACE_DDF_CLIENT: fibril_mutex_lock(&devman_client_mutex); - + if (devman_client_sess == NULL) devman_client_sess = service_connect(SERVICE_DEVMAN, INTERFACE_DDF_CLIENT, 0); - + fibril_mutex_unlock(&devman_client_mutex); - + if (devman_client_sess == NULL) return NULL; - + return async_exchange_begin(devman_client_sess); default: @@ -179,20 +179,20 @@ { async_exch_t *exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER); - + ipc_call_t answer; aid_t req = async_send_2(exch, DEVMAN_DRIVER_REGISTER, 0, 0, &answer); errno_t retval = async_data_write_start(exch, name, str_size(name)); - - devman_exchange_end(exch); - + + devman_exchange_end(exch); + if (retval != EOK) { async_forget(req); return retval; } - + exch = devman_exchange_begin(INTERFACE_DDF_DRIVER); async_connect_to_me(exch, 0, 0, 0); devman_exchange_end(exch); - + async_wait_for(req, &retval); return retval; @@ -218,5 +218,5 @@ unsigned long match_count = list_count(&match_ids->ids); async_exch_t *exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER); - + ipc_call_t answer; aid_t req = async_send_3(exch, DEVMAN_ADD_FUNCTION, (sysarg_t) ftype, @@ -228,5 +228,5 @@ return retval; } - + list_foreach(match_ids->ids, link, match_id_t, match_id) { ipc_call_t answer2; @@ -241,5 +241,5 @@ return retval; } - + async_wait_for(req2, &retval); if (retval != EOK) { @@ -249,7 +249,7 @@ } } - - devman_exchange_end(exch); - + + devman_exchange_end(exch); + async_wait_for(req, &retval); if (retval == EOK) { @@ -260,5 +260,5 @@ *funh = -1; } - + return retval; } @@ -268,5 +268,5 @@ { async_exch_t *exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER); - + ipc_call_t answer; aid_t req = async_send_1(exch, DEVMAN_ADD_DEVICE_TO_CATEGORY, @@ -274,12 +274,12 @@ errno_t retval = async_data_write_start(exch, cat_name, str_size(cat_name)); - - devman_exchange_end(exch); - + + devman_exchange_end(exch); + if (retval != EOK) { async_forget(req); return retval; } - + async_wait_for(req, &retval); return retval; @@ -289,5 +289,5 @@ { async_sess_t *sess; - + if (flags & IPC_FLAG_BLOCKING) sess = service_connect_blocking(SERVICE_DEVMAN, @@ -296,5 +296,5 @@ sess = service_connect(SERVICE_DEVMAN, INTERFACE_DEVMAN_DEVICE, handle); - + return sess; } @@ -311,9 +311,9 @@ async_exch_t *exch; errno_t retval; - + exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER); retval = async_req_1_0(exch, DEVMAN_REMOVE_FUNCTION, (sysarg_t) funh); devman_exchange_end(exch); - + return retval; } @@ -324,7 +324,7 @@ if (exch == NULL) return ENOMEM; - + errno_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_ONLINE, funh); - + devman_exchange_end(exch); return retval; @@ -336,7 +336,7 @@ if (exch == NULL) return ENOMEM; - + errno_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_OFFLINE, funh); - + devman_exchange_end(exch); return retval; @@ -347,5 +347,5 @@ { async_sess_t *sess; - + if (flags & IPC_FLAG_BLOCKING) sess = service_connect_blocking(SERVICE_DEVMAN, @@ -354,5 +354,5 @@ sess = service_connect_blocking(SERVICE_DEVMAN, INTERFACE_DEVMAN_PARENT, handle); - + return sess; } @@ -362,5 +362,5 @@ { async_exch_t *exch; - + if (flags & IPC_FLAG_BLOCKING) exch = devman_exchange_begin_blocking(INTERFACE_DDF_CLIENT); @@ -370,5 +370,5 @@ return ENOMEM; } - + ipc_call_t answer; aid_t req = async_send_2(exch, DEVMAN_DEVICE_GET_HANDLE, flags, 0, @@ -376,24 +376,24 @@ errno_t retval = async_data_write_start(exch, pathname, str_size(pathname)); - - devman_exchange_end(exch); - + + devman_exchange_end(exch); + if (retval != EOK) { async_forget(req); return retval; } - + async_wait_for(req, &retval); - + if (retval != EOK) { if (handle != NULL) *handle = (devman_handle_t) -1; - - return retval; - } - + + return retval; + } + if (handle != NULL) *handle = (devman_handle_t) IPC_GET_ARG1(answer); - + return retval; } @@ -406,26 +406,26 @@ size_t act_size; errno_t dretval; - + exch = devman_exchange_begin_blocking(INTERFACE_DDF_CLIENT); - + ipc_call_t answer; aid_t req = async_send_2(exch, method, arg1, arg2, &answer); aid_t dreq = async_data_read(exch, buf, buf_size - 1, &dreply); async_wait_for(dreq, &dretval); - - devman_exchange_end(exch); - + + devman_exchange_end(exch); + if (dretval != EOK) { async_forget(req); return dretval; } - + errno_t retval; async_wait_for(req, &retval); - - if (retval != EOK) { - return retval; - } - + + if (retval != EOK) { + return retval; + } + if (r1 != NULL) *r1 = IPC_GET_ARG1(answer); @@ -433,5 +433,5 @@ assert(act_size <= buf_size - 1); buf[act_size] = '\0'; - + return EOK; } @@ -475,7 +475,7 @@ if (exch == NULL) return ENOMEM; - + errno_t retval = async_req_1_0(exch, DEVMAN_FUN_ONLINE, funh); - + devman_exchange_end(exch); return retval; @@ -487,7 +487,7 @@ if (exch == NULL) return ENOMEM; - + errno_t retval = async_req_1_0(exch, DEVMAN_FUN_OFFLINE, funh); - + devman_exchange_end(exch); return retval; @@ -502,19 +502,19 @@ aid_t req = async_send_1(exch, method, arg1, &answer); errno_t rc = async_data_read_start(exch, handle_buf, buf_size); - - devman_exchange_end(exch); - + + devman_exchange_end(exch); + if (rc != EOK) { async_forget(req); return rc; } - + errno_t retval; async_wait_for(req, &retval); - - if (retval != EOK) { - return retval; - } - + + if (retval != EOK) { + return retval; + } + *act_size = IPC_GET_ARG1(answer); return EOK; @@ -579,8 +579,8 @@ if (exch == NULL) return ENOMEM; - + errno_t retval = async_req_1_1(exch, DEVMAN_FUN_GET_CHILD, funh, devh); - + devman_exchange_end(exch); return retval; @@ -599,8 +599,8 @@ if (exch == NULL) return ENOMEM; - + errno_t retval = async_req_1_1(exch, DEVMAN_DEV_GET_PARENT, devh, funh); - + devman_exchange_end(exch); return retval; @@ -612,8 +612,8 @@ if (exch == NULL) return ENOMEM; - + errno_t retval = async_req_1_1(exch, DEVMAN_FUN_SID_TO_HANDLE, sid, handle); - + devman_exchange_end(exch); return retval; @@ -640,29 +640,29 @@ if (exch == NULL) return ENOMEM; - + ipc_call_t answer; aid_t req = async_send_0(exch, DEVMAN_DRIVER_GET_HANDLE, &answer); errno_t retval = async_data_write_start(exch, drvname, str_size(drvname)); - - devman_exchange_end(exch); - + + devman_exchange_end(exch); + if (retval != EOK) { async_forget(req); return retval; } - + async_wait_for(req, &retval); - + if (retval != EOK) { if (handle != NULL) *handle = (devman_handle_t) -1; - - return retval; - } - + + return retval; + } + if (handle != NULL) *handle = (devman_handle_t) IPC_GET_ARG1(answer); - + return retval; } @@ -695,8 +695,8 @@ if (exch == NULL) return ENOMEM; - + errno_t rc = async_req_1_1(exch, DEVMAN_DRIVER_GET_STATE, drvh, &state); - + devman_exchange_end(exch); if (rc != EOK) @@ -712,7 +712,7 @@ if (exch == NULL) return ENOMEM; - + errno_t rc = async_req_1_0(exch, DEVMAN_DRIVER_LOAD, drvh); - + devman_exchange_end(exch); return rc; @@ -724,7 +724,7 @@ if (exch == NULL) return ENOMEM; - + errno_t rc = async_req_1_0(exch, DEVMAN_DRIVER_UNLOAD, drvh); - + devman_exchange_end(exch); return rc; Index: uspace/lib/c/generic/dirent.c =================================================================== --- uspace/lib/c/generic/dirent.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/dirent.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -53,5 +53,5 @@ return NULL; } - + int fd; errno_t rc = vfs_lookup(dirname, WALK_DIRECTORY, &fd); @@ -61,5 +61,5 @@ return NULL; } - + rc = vfs_open(fd, MODE_READ); if (rc != EOK) { @@ -69,5 +69,5 @@ return NULL; } - + dirp->fd = fd; dirp->pos = 0; @@ -85,5 +85,5 @@ errno_t rc; ssize_t len = 0; - + rc = vfs_read_short(dirp->fd, dirp->pos, &dirp->res.d_name[0], NAME_MAX + 1, &len); @@ -92,7 +92,7 @@ return NULL; } - + dirp->pos += len; - + return &dirp->res; } Index: uspace/lib/c/generic/dnsr.c =================================================================== --- uspace/lib/c/generic/dnsr.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/dnsr.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -45,18 +45,18 @@ { fibril_mutex_lock(&dnsr_sess_mutex); - + if (dnsr_sess == NULL) { service_id_t dnsr_svc; - + (void) loc_service_get_id(SERVICE_NAME_DNSR, &dnsr_svc, IPC_FLAG_BLOCKING); - + dnsr_sess = loc_service_connect(dnsr_svc, INTERFACE_DNSR, IPC_FLAG_BLOCKING); } - + async_sess_t *sess = dnsr_sess; fibril_mutex_unlock(&dnsr_sess_mutex); - + return async_exchange_begin(sess); } @@ -70,9 +70,9 @@ { async_exch_t *exch = dnsr_exchange_begin(); - + ipc_call_t answer; aid_t req = async_send_1(exch, DNSR_NAME2HOST, (sysarg_t) ver, &answer); - + errno_t rc = async_data_write_start(exch, name, str_size(name)); if (rc != EOK) { @@ -85,12 +85,12 @@ if (info == NULL) return ENOMEM; - + ipc_call_t answer_addr; aid_t req_addr = async_data_read(exch, &info->addr, sizeof(inet_addr_t), &answer_addr); - + errno_t retval_addr; async_wait_for(req_addr, &retval_addr); - + if (retval_addr != EOK) { async_exchange_end(exch); @@ -99,15 +99,15 @@ return retval_addr; } - + ipc_call_t answer_cname; char cname_buf[DNSR_NAME_MAX_SIZE + 1]; aid_t req_cname = async_data_read(exch, cname_buf, DNSR_NAME_MAX_SIZE, &answer_cname); - + dnsr_exchange_end(exch); - + errno_t retval_cname; async_wait_for(req_cname, &retval_cname); - + if (retval_cname != EOK) { async_forget(req); @@ -115,8 +115,8 @@ return retval_cname; } - + errno_t retval; async_wait_for(req, &retval); - + if (retval != EOK) { async_forget(req); @@ -124,12 +124,12 @@ return retval; } - + size_t act_size = IPC_GET_ARG2(answer_cname); assert(act_size <= DNSR_NAME_MAX_SIZE); - + cname_buf[act_size] = '\0'; - + info->cname = str_dup(cname_buf); - + if (info->cname == NULL) { free(info); @@ -145,5 +145,5 @@ if (info == NULL) return; - + free(info->cname); free(info); @@ -153,19 +153,19 @@ { async_exch_t *exch = dnsr_exchange_begin(); - + ipc_call_t answer; aid_t req = async_send_0(exch, DNSR_GET_SRVADDR, &answer); errno_t rc = async_data_read_start(exch, srvaddr, sizeof(inet_addr_t)); - + loc_exchange_end(exch); - + if (rc != EOK) { async_forget(req); return rc; } - + errno_t retval; async_wait_for(req, &retval); - + return retval; } @@ -174,19 +174,19 @@ { async_exch_t *exch = dnsr_exchange_begin(); - + ipc_call_t answer; aid_t req = async_send_0(exch, DNSR_SET_SRVADDR, &answer); errno_t rc = async_data_write_start(exch, srvaddr, sizeof(inet_addr_t)); - + loc_exchange_end(exch); - + if (rc != EOK) { async_forget(req); return rc; } - + errno_t retval; async_wait_for(req, &retval); - + return retval; } Index: uspace/lib/c/generic/double_to_str.c =================================================================== --- uspace/lib/c/generic/double_to_str.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/double_to_str.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -86,5 +86,5 @@ { assert(/* is_normalized(x) && */ is_normalized(y)); - + const uint32_t low_bits = -1; @@ -98,5 +98,5 @@ bd = b * d; ad = a * d; - + bc = b * c; ac = a * c; @@ -125,5 +125,5 @@ ret.significand = ac + (bc >> 32) + (ad >> 32) + (tmp >> 32); ret.exponent = x.exponent + y.exponent + significand_width; - + return ret; } @@ -137,5 +137,5 @@ fp_num_t result; - + result.significand = a.significand - b.significand; result.exponent = a.exponent; @@ -363,5 +363,5 @@ */ uint32_t int_part = (uint32_t)(scaled_upper.significand >> (-one.exponent)); - + /* * Fractional part of scaled_upper. @@ -430,5 +430,5 @@ /* frac_part / one */ int digit = (int)(frac_part >> (-one.exponent)); - + /* frac_part %= one */ frac_part &= one.significand - 1; @@ -645,5 +645,5 @@ /* frac_part / one */ int digit = (int)(frac_part >> (-one.exponent)); - + /* frac_part %= one */ frac_part &= one.significand - 1; Index: uspace/lib/c/generic/elf/elf_mod.c =================================================================== --- uspace/lib/c/generic/elf/elf_mod.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/elf/elf_mod.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -166,5 +166,5 @@ return EE_INVALID; } - + /* Identify ELF compatibility */ if (header->e_ident[EI_DATA] != ELF_DATA_ENCODING || @@ -372,5 +372,5 @@ flags |= AS_AREA_READ; flags |= AS_AREA_CACHEABLE; - + base = ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE); mem_sz = entry->p_memsz + (entry->p_vaddr - base); @@ -458,5 +458,5 @@ break; } - + return EE_OK; } Index: uspace/lib/c/generic/fibril.c =================================================================== --- uspace/lib/c/generic/fibril.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/fibril.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -77,8 +77,8 @@ rcu_register_fibril(); #endif - + /* Call the implementing function. */ fibril->retval = fibril->func(fibril->arg); - + futex_down(&async_futex); fibril_switch(FIBRIL_FROM_DEAD); @@ -94,5 +94,5 @@ if (!tcb) return NULL; - + fibril_t *fibril = malloc(sizeof(fibril_t)); if (!fibril) { @@ -100,8 +100,8 @@ return NULL; } - + tcb->fibril_data = fibril; fibril->tcb = tcb; - + fibril->func = NULL; fibril->arg = NULL; @@ -110,5 +110,5 @@ fibril->retval = 0; fibril->flags = 0; - + fibril->waits_for = NULL; @@ -123,5 +123,5 @@ list_append(&fibril->all_link, &fibril_list); futex_up(&fibril_futex); - + return fibril; } @@ -176,8 +176,8 @@ break; } - + fibril_t *srcf = __tcb_get()->fibril_data; if (stype != FIBRIL_FROM_DEAD) { - + /* Save current state */ if (!context_save(&srcf->ctx)) { @@ -202,8 +202,8 @@ srcf->clean_after_me = NULL; } - + return 1; /* futex_unlock already done here */ } - + /* Put the current fibril into the correct run list */ switch (stype) { @@ -226,5 +226,5 @@ } } - + fibril_t *dstf; @@ -235,5 +235,5 @@ dstf = list_get_instance(list_first(&manager_list), fibril_t, link); - + if (stype == FIBRIL_FROM_DEAD) dstf->clean_after_me = srcf; @@ -246,7 +246,7 @@ list_remove(&dstf->link); - + futex_unlock(&fibril_futex); - + #ifdef FUTEX_UPGRADABLE if (stype == FIBRIL_FROM_DEAD) { @@ -254,5 +254,5 @@ } #endif - + context_restore(&dstf->ctx); /* not reached */ @@ -271,9 +271,9 @@ { fibril_t *fibril; - + fibril = fibril_setup(); if (fibril == NULL) return 0; - + size_t stack_size = (stksz == FIBRIL_DFLT_STK_SIZE) ? stack_size_get() : stksz; @@ -285,5 +285,5 @@ return 0; } - + fibril->func = func; fibril->arg = arg; @@ -307,5 +307,5 @@ { fibril_t *fibril = (fibril_t *) fid; - + as_area_destroy(fibril->stack); fibril_teardown(fibril, false); @@ -321,5 +321,5 @@ { fibril_t *fibril = (fibril_t *) fid; - + futex_lock(&fibril_futex); list_append(&fibril->link, &ready_list); @@ -336,5 +336,5 @@ { fibril_t *fibril = (fibril_t *) fid; - + futex_lock(&fibril_futex); list_append(&fibril->link, &manager_list); Index: uspace/lib/c/generic/fibril_synch.c =================================================================== --- uspace/lib/c/generic/fibril_synch.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/fibril_synch.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -125,5 +125,5 @@ { bool locked = false; - + futex_down(&async_futex); if (fm->counter > 0) { @@ -133,5 +133,5 @@ } futex_up(&async_futex); - + return locked; } @@ -143,5 +143,5 @@ awaiter_t *wdp; fibril_t *f; - + tmp = list_first(&fm->waiters); assert(tmp != NULL); @@ -173,10 +173,10 @@ { bool locked = false; - + futex_down(&async_futex); if (fm->counter <= 0) locked = true; futex_up(&async_futex); - + return locked; } @@ -193,5 +193,5 @@ { fibril_t *f = (fibril_t *) fibril_get_id(); - + futex_down(&async_futex); if (frw->writers) { @@ -217,5 +217,5 @@ { fibril_t *f = (fibril_t *) fibril_get_id(); - + futex_down(&async_futex); if (frw->writers || frw->readers) { @@ -261,19 +261,19 @@ frw->writers--; } - + assert(!frw->readers && !frw->writers); - + frw->oi.owned_by = NULL; - + while (!list_empty(&frw->waiters)) { link_t *tmp = list_first(&frw->waiters); awaiter_t *wdp; fibril_t *f; - + wdp = list_get_instance(tmp, awaiter_t, wu_event.link); f = (fibril_t *) wdp->fid; - + f->waits_for = NULL; - + if (f->flags & FIBRIL_WRITER) { if (frw->readers) @@ -386,5 +386,5 @@ list_remove(&wdata.wu_event.link); futex_up(&async_futex); - + return wdata.to_event.occurred ? ETIMEOUT : EOK; } Index: uspace/lib/c/generic/futex.c =================================================================== --- uspace/lib/c/generic/futex.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/futex.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -56,10 +56,10 @@ { futex_down(&upg_and_wait_futex); - + if (!_upgrade_futexes) { rcu_assign(_upgrade_futexes, 1); _rcu_synchronize(BM_BLOCK_THREAD); } - + futex_up(&upg_and_wait_futex); } Index: uspace/lib/c/generic/getopt.c =================================================================== --- uspace/lib/c/generic/getopt.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/getopt.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -99,5 +99,5 @@ { int c; - + c = a % b; while (c != 0) { @@ -106,5 +106,5 @@ c = a % b; } - + return b; } @@ -366,5 +366,5 @@ } else current_argv_len = str_size(current_argv); - + for (i = 0; long_options[i].name; i++) { /* find matching long option */ Index: uspace/lib/c/generic/gsort.c =================================================================== --- uspace/lib/c/generic/gsort.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/gsort.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -76,5 +76,5 @@ { size_t i = 0; - + while (i < cnt) { if ((i != 0) && @@ -110,5 +110,5 @@ uint8_t ibuf_slot[IBUF_SIZE]; void *slot; - + if (elem_size > IBUF_SIZE) { slot = (void *) malloc(elem_size); @@ -117,10 +117,10 @@ } else slot = (void *) ibuf_slot; - + _gsort(data, cnt, elem_size, cmp, arg, slot); - + if (elem_size > IBUF_SIZE) free(slot); - + return true; } Index: uspace/lib/c/generic/ieee_double.c =================================================================== --- uspace/lib/c/generic/ieee_double.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/ieee_double.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -39,5 +39,5 @@ const int exponent_shift = 64 - 11 - 1; const uint64_t sign_mask = 0x8000000000000000ULL; - + const int special_exponent = 0x7ff; const int denormal_exponent = 0; Index: uspace/lib/c/generic/inet.c =================================================================== --- uspace/lib/c/generic/inet.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/inet.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -45,20 +45,20 @@ { async_exch_t *exch = async_exchange_begin(inet_sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, INET_CALLBACK_CREATE, &answer); - + port_id_t port; errno_t rc = async_create_callback_port(exch, INTERFACE_INET_CB, 0, 0, inet_cb_conn, NULL, &port); - - async_exchange_end(exch); - + + async_exchange_end(exch); + if (rc != EOK) return rc; - + errno_t retval; async_wait_for(req, &retval); - + return retval; } @@ -69,5 +69,5 @@ errno_t rc = async_req_1_0(exch, INET_SET_PROTO, protocol); async_exchange_end(exch); - + return rc; } @@ -81,15 +81,15 @@ assert(inet_ev_ops == NULL); assert(inet_protocol == 0); - + rc = loc_service_get_id(SERVICE_NAME_INET, &inet_svc, IPC_FLAG_BLOCKING); if (rc != EOK) return ENOENT; - + inet_sess = loc_service_connect(inet_svc, INTERFACE_INET, IPC_FLAG_BLOCKING); if (inet_sess == NULL) return ENOENT; - + if (inet_set_proto(protocol) != EOK) { async_hangup(inet_sess); @@ -97,5 +97,5 @@ return EIO; } - + if (inet_callback_create() != EOK) { async_hangup(inet_sess); @@ -103,5 +103,5 @@ return EIO; } - + inet_protocol = protocol; inet_ev_ops = ev_ops; @@ -113,9 +113,9 @@ { async_exch_t *exch = async_exchange_begin(inet_sess); - + ipc_call_t answer; aid_t req = async_send_4(exch, INET_SEND, dgram->iplink, dgram->tos, ttl, df, &answer); - + errno_t rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t)); if (rc != EOK) { @@ -124,5 +124,5 @@ return rc; } - + rc = async_data_write_start(exch, &dgram->dest, sizeof(inet_addr_t)); if (rc != EOK) { @@ -131,17 +131,17 @@ return rc; } - + rc = async_data_write_start(exch, dgram->data, dgram->size); - - async_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - + + async_exchange_end(exch); + + if (rc != EOK) { + async_forget(req); + return rc; + } + errno_t retval; async_wait_for(req, &retval); - + return retval; } @@ -150,8 +150,8 @@ { async_exch_t *exch = async_exchange_begin(inet_sess); - + ipc_call_t answer; aid_t req = async_send_1(exch, INET_GET_SRCADDR, tos, &answer); - + errno_t rc = async_data_write_start(exch, remote, sizeof(inet_addr_t)); if (rc != EOK) { @@ -160,17 +160,17 @@ return rc; } - + rc = async_data_read_start(exch, local, sizeof(inet_addr_t)); - - async_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - + + async_exchange_end(exch); + + if (rc != EOK) { + async_forget(req); + return rc; + } + errno_t retval; async_wait_for(req, &retval); - + return retval; } @@ -179,8 +179,8 @@ { inet_dgram_t dgram; - + dgram.tos = IPC_GET_ARG1(*icall); dgram.iplink = IPC_GET_ARG2(*icall); - + ipc_callid_t callid; size_t size; @@ -190,5 +190,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -196,5 +196,5 @@ return; } - + errno_t rc = async_data_write_finalize(callid, &dgram.src, size); if (rc != EOK) { @@ -203,5 +203,5 @@ return; } - + if (!async_data_write_receive(&callid, &size)) { async_answer_0(callid, EINVAL); @@ -209,5 +209,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -215,5 +215,5 @@ return; } - + rc = async_data_write_finalize(callid, &dgram.dest, size); if (rc != EOK) { @@ -222,5 +222,5 @@ return; } - + rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size); if (rc != EOK) { @@ -228,5 +228,5 @@ return; } - + rc = inet_ev_ops->recv(&dgram); free(dgram.data); @@ -239,10 +239,10 @@ ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { /* TODO: Handle hangup */ return; } - + switch (IPC_GET_IMETHOD(call)) { case INET_EV_RECV: Index: uspace/lib/c/generic/inet/tcp.c =================================================================== --- uspace/lib/c/generic/inet/tcp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/inet/tcp.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -66,9 +66,9 @@ aid_t req = async_send_0(exch, TCP_CALLBACK_CREATE, NULL); - + port_id_t port; errno_t rc = async_create_callback_port(exch, INTERFACE_TCP_CB, 0, 0, tcp_cb_conn, tcp, &port); - + async_exchange_end(exch); Index: uspace/lib/c/generic/inet/udp.c =================================================================== --- uspace/lib/c/generic/inet/udp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/inet/udp.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -53,9 +53,9 @@ aid_t req = async_send_0(exch, UDP_CALLBACK_CREATE, NULL); - + port_id_t port; errno_t rc = async_create_callback_port(exch, INTERFACE_UDP_CB, 0, 0, udp_cb_conn, udp, &port); - + async_exchange_end(exch); Index: uspace/lib/c/generic/inetcfg.c =================================================================== --- uspace/lib/c/generic/inetcfg.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/inetcfg.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -119,15 +119,15 @@ assert(inetcfg_sess == NULL); - + rc = loc_service_get_id(SERVICE_NAME_INET, &inet_svc, IPC_FLAG_BLOCKING); if (rc != EOK) return ENOENT; - + inetcfg_sess = loc_service_connect(inet_svc, INTERFACE_INETCFG, IPC_FLAG_BLOCKING); if (inetcfg_sess == NULL) return ENOENT; - + return EOK; } @@ -137,9 +137,9 @@ { async_exch_t *exch = async_exchange_begin(inetcfg_sess); - + ipc_call_t answer; aid_t req = async_send_1(exch, INETCFG_ADDR_CREATE_STATIC, link_id, &answer); - + errno_t rc = async_data_write_start(exch, naddr, sizeof(inet_naddr_t)); if (rc != EOK) { @@ -148,19 +148,19 @@ return rc; } - + rc = async_data_write_start(exch, name, str_size(name)); - - async_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - - errno_t retval; - async_wait_for(req, &retval); - + + async_exchange_end(exch); + + if (rc != EOK) { + async_forget(req); + return rc; + } + + errno_t retval; + async_wait_for(req, &retval); + *addr_id = IPC_GET_ARG1(answer); - + return retval; } @@ -179,15 +179,15 @@ { async_exch_t *exch = async_exchange_begin(inetcfg_sess); - + ipc_call_t answer; aid_t req = async_send_1(exch, INETCFG_ADDR_GET, addr_id, &answer); - + ipc_call_t answer_naddr; aid_t req_naddr = async_data_read(exch, &ainfo->naddr, sizeof(inet_naddr_t), &answer_naddr); - + errno_t retval_naddr; async_wait_for(req_naddr, &retval_naddr); - + if (retval_naddr != EOK) { async_exchange_end(exch); @@ -195,34 +195,34 @@ return retval_naddr; } - + ipc_call_t answer_name; char name_buf[LOC_NAME_MAXLEN + 1]; aid_t req_name = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &answer_name); - - async_exchange_end(exch); - + + async_exchange_end(exch); + errno_t retval_name; async_wait_for(req_name, &retval_name); - + if (retval_name != EOK) { async_forget(req); return retval_name; } - - errno_t retval; - async_wait_for(req, &retval); - + + errno_t retval; + async_wait_for(req, &retval); + if (retval != EOK) return retval; - + size_t act_size = IPC_GET_ARG2(answer_name); assert(act_size <= LOC_NAME_MAXLEN); - + name_buf[act_size] = '\0'; - + ainfo->ilink = IPC_GET_ARG1(answer); ainfo->name = str_dup(name_buf); - + return EOK; } @@ -329,8 +329,8 @@ { async_exch_t *exch = async_exchange_begin(inetcfg_sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, INETCFG_SROUTE_CREATE, &answer); - + errno_t rc = async_data_write_start(exch, dest, sizeof(inet_naddr_t)); if (rc != EOK) { @@ -339,5 +339,5 @@ return rc; } - + rc = async_data_write_start(exch, router, sizeof(inet_addr_t)); if (rc != EOK) { @@ -346,19 +346,19 @@ return rc; } - + rc = async_data_write_start(exch, name, str_size(name)); - - async_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - - errno_t retval; - async_wait_for(req, &retval); - + + async_exchange_end(exch); + + if (rc != EOK) { + async_forget(req); + return rc; + } + + errno_t retval; + async_wait_for(req, &retval); + *sroute_id = IPC_GET_ARG1(answer); - + return retval; } @@ -377,15 +377,15 @@ { async_exch_t *exch = async_exchange_begin(inetcfg_sess); - + ipc_call_t answer; aid_t req = async_send_1(exch, INETCFG_SROUTE_GET, sroute_id, &answer); - + ipc_call_t answer_dest; aid_t req_dest = async_data_read(exch, &srinfo->dest, sizeof(inet_naddr_t), &answer_dest); - + errno_t retval_dest; async_wait_for(req_dest, &retval_dest); - + if (retval_dest != EOK) { async_exchange_end(exch); @@ -393,12 +393,12 @@ return retval_dest; } - + ipc_call_t answer_router; aid_t req_router = async_data_read(exch, &srinfo->router, sizeof(inet_addr_t), &answer_router); - + errno_t retval_router; async_wait_for(req_router, &retval_router); - + if (retval_router != EOK) { async_exchange_end(exch); @@ -406,33 +406,33 @@ return retval_router; } - + ipc_call_t answer_name; char name_buf[LOC_NAME_MAXLEN + 1]; aid_t req_name = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &answer_name); - - async_exchange_end(exch); - + + async_exchange_end(exch); + errno_t retval_name; async_wait_for(req_name, &retval_name); - + if (retval_name != EOK) { async_forget(req); return retval_name; } - - errno_t retval; - async_wait_for(req, &retval); - + + errno_t retval; + async_wait_for(req, &retval); + if (retval != EOK) return retval; - + size_t act_size = IPC_GET_ARG2(answer_name); assert(act_size <= LOC_NAME_MAXLEN); - + name_buf[act_size] = '\0'; - + srinfo->name = str_dup(name_buf); - + return EOK; } Index: uspace/lib/c/generic/inetping.c =================================================================== --- uspace/lib/c/generic/inetping.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/inetping.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -68,5 +68,5 @@ rc = async_create_callback_port(exch, INTERFACE_INETPING_CB, 0, 0, inetping_cb_conn, NULL, &port); - + async_exchange_end(exch); Index: uspace/lib/c/generic/io/asprintf.c =================================================================== --- uspace/lib/c/generic/io/asprintf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/asprintf.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -58,5 +58,5 @@ NULL }; - + return printf_core(fmt, &ps, args); } @@ -68,5 +68,5 @@ int ret = vprintf_size(fmt, args); va_end(args); - + return ret; } @@ -88,13 +88,13 @@ int ret = vprintf_size(fmt, args2); va_end(args2); - + if (ret > 0) { *strp = malloc(STR_BOUNDS(ret) + 1); if (*strp == NULL) return -1; - + vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args); } - + return ret; } @@ -115,5 +115,5 @@ int ret = vasprintf(strp, fmt, args); va_end(args); - + return ret; } Index: uspace/lib/c/generic/io/chargrid.c =================================================================== --- uspace/lib/c/generic/io/chargrid.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/chargrid.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -57,5 +57,5 @@ sizeof(chargrid_t) + cols * rows * sizeof(charfield_t); chargrid_t *scrbuf; - + if ((flags & CHARGRID_FLAG_SHARED) == CHARGRID_FLAG_SHARED) { scrbuf = (chargrid_t *) as_area_create(AS_AREA_ANY, size, @@ -69,5 +69,5 @@ return NULL; } - + scrbuf->size = size; scrbuf->flags = flags; @@ -75,11 +75,11 @@ scrbuf->rows = rows; scrbuf->cursor_visible = false; - + scrbuf->attrs.type = CHAR_ATTR_STYLE; scrbuf->attrs.val.style = STYLE_NORMAL; - + scrbuf->top_row = 0; chargrid_clear(scrbuf); - + return scrbuf; } @@ -107,8 +107,8 @@ scrbuf->top_row = (scrbuf->top_row + 1) % scrbuf->rows; chargrid_clear_row(scrbuf, scrbuf->row); - + return scrbuf->rows; } - + return 2; } @@ -122,5 +122,5 @@ return chargrid_update_rows(scrbuf); } - + return 1; } @@ -144,17 +144,17 @@ assert(scrbuf->col < scrbuf->cols); assert(scrbuf->row < scrbuf->rows); - + charfield_t *field = chargrid_charfield_at(scrbuf, scrbuf->col, scrbuf->row); - + field->ch = ch; field->attrs = scrbuf->attrs; field->flags |= CHAR_FLAG_DIRTY; - + if (update) { scrbuf->col++; return chargrid_update_cols(scrbuf); } - + return 1; } @@ -173,8 +173,8 @@ assert(scrbuf->col < scrbuf->cols); assert(scrbuf->row < scrbuf->rows); - + scrbuf->col = 0; scrbuf->row++; - + return chargrid_update_rows(scrbuf); } @@ -194,11 +194,11 @@ assert(scrbuf->col < scrbuf->cols); assert(scrbuf->row < scrbuf->rows); - + sysarg_t spaces = tab_size - scrbuf->cols % tab_size; sysarg_t flush = 1; - + for (sysarg_t i = 0; i < spaces; i++) flush += chargrid_putchar(scrbuf, ' ', true) - 1; - + return flush; } @@ -220,16 +220,16 @@ assert(scrbuf->col < scrbuf->cols); assert(scrbuf->row < scrbuf->rows); - + if ((scrbuf->col == 0) && (scrbuf->row == 0)) return 0; - + if (scrbuf->col == 0) { scrbuf->col = scrbuf->cols - 1; scrbuf->row--; - + chargrid_putchar(scrbuf, ' ', false); return 2; } - + scrbuf->col--; chargrid_putchar(scrbuf, ' ', false); @@ -249,5 +249,5 @@ scrbuf->data[pos].flags = CHAR_FLAG_DIRTY; } - + scrbuf->col = 0; scrbuf->row = 0; @@ -284,5 +284,5 @@ assert(col); assert(row); - + *col = scrbuf->col; *row = scrbuf->row; @@ -305,5 +305,5 @@ charfield_t *field = chargrid_charfield_at(scrbuf, col, row); - + field->ch = 0; field->attrs = scrbuf->attrs; Index: uspace/lib/c/generic/io/console.c =================================================================== --- uspace/lib/c/generic/io/console.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/console.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -48,5 +48,5 @@ if (!ctrl) return NULL; - + ctrl->input_sess = vfs_fsession(ifile, INTERFACE_CONSOLE); if (!ctrl->input_sess) { @@ -54,5 +54,5 @@ return NULL; } - + ctrl->output_sess = vfs_fsession(ofile, INTERFACE_CONSOLE); if (!ctrl->output_sess) { @@ -60,9 +60,9 @@ return NULL; } - + ctrl->input = ifile; ctrl->output = ofile; ctrl->input_aid = 0; - + return ctrl; } @@ -95,5 +95,5 @@ errno_t rc = async_req_0_2(exch, CONSOLE_GET_SIZE, cols, rows); async_exchange_end(exch); - + return rc; } @@ -134,5 +134,5 @@ errno_t rc = async_req_0_1(exch, CONSOLE_GET_COLOR_CAP, ccap); async_exchange_end(exch); - + return rc; } @@ -143,5 +143,5 @@ errno_t rc = async_req_0_2(exch, CONSOLE_GET_POS, col, row); async_exchange_end(exch); - + return rc; } @@ -183,17 +183,17 @@ if (ctrl->input_aid == 0) { ipc_call_t result; - + async_exch_t *exch = async_exchange_begin(ctrl->input_sess); aid_t aid = async_send_0(exch, CONSOLE_GET_EVENT, &result); async_exchange_end(exch); - + errno_t rc; async_wait_for(aid, &rc); - + if (rc != EOK) { errno = rc; return false; } - + rc = console_ev_decode(&result, event); if (rc != EOK) { @@ -204,12 +204,12 @@ errno_t retval; async_wait_for(ctrl->input_aid, &retval); - + ctrl->input_aid = 0; - + if (retval != EOK) { errno = retval; return false; } - + errno_t rc = console_ev_decode(&ctrl->input_call, event); if (rc != EOK) { @@ -218,5 +218,5 @@ } } - + return true; } @@ -227,5 +227,5 @@ struct timeval t0; gettimeofday(&t0, NULL); - + if (ctrl->input_aid == 0) { async_exch_t *exch = async_exchange_begin(ctrl->input_sess); @@ -234,5 +234,5 @@ async_exchange_end(exch); } - + errno_t retval; errno_t rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout); @@ -242,12 +242,12 @@ return false; } - + ctrl->input_aid = 0; - + if (retval != EOK) { errno = retval; return false; } - + rc = console_ev_decode(&ctrl->input_call, event); if (rc != EOK) { @@ -255,10 +255,10 @@ return false; } - + /* Update timeout */ struct timeval t1; gettimeofday(&t1, NULL); *timeout -= tv_sub_diff(&t1, &t0); - + return true; } Index: uspace/lib/c/generic/io/input.c =================================================================== --- uspace/lib/c/generic/io/input.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/input.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -61,5 +61,5 @@ errno_t rc = async_create_callback_port(exch, INTERFACE_INPUT_CB, 0, 0, input_cb_conn, input, &port); - + async_exchange_end(exch); @@ -88,5 +88,5 @@ errno_t rc = async_req_0_0(exch, INPUT_ACTIVATE); async_exchange_end(exch); - + return rc; } Index: uspace/lib/c/generic/io/io.c =================================================================== --- uspace/lib/c/generic/io/io.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/io.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -119,5 +119,5 @@ list_append(&stdin->link, &files); } - + int outfd = inbox_get("stdout"); if (outfd >= 0) { @@ -133,5 +133,5 @@ list_append(&stdout->link, &files); } - + int errfd = inbox_get("stderr"); if (errfd >= 0) { @@ -165,8 +165,8 @@ return false; } - + if ((*mp == 'b') || (*mp == 't')) mp++; - + bool plus; if (*mp == '+') { @@ -175,5 +175,5 @@ } else plus = false; - + if (*mp != 0) { errno = EINVAL; @@ -183,5 +183,5 @@ *create = false; *truncate = false; - + /* Parse first character of fmode and determine mode for vfs_open(). */ switch (fmode[0]) { @@ -209,5 +209,5 @@ return false; } - + return true; } @@ -241,5 +241,5 @@ { /* FIXME: Use more complex rules for setting buffering options. */ - + switch (stream->fd) { case 1: @@ -259,5 +259,5 @@ { assert(stream->buf == NULL); - + stream->buf = malloc(stream->buf_size); if (stream->buf == NULL) { @@ -265,5 +265,5 @@ return EOF; } - + stream->buf_head = stream->buf; stream->buf_tail = stream->buf; @@ -285,5 +285,5 @@ if (!parse_mode(fmode, &mode, &create, &truncate)) return NULL; - + /* Open file. */ FILE *stream = malloc(sizeof(FILE)); @@ -311,5 +311,5 @@ return NULL; } - + if (truncate) { rc = vfs_resize(file, 0); @@ -331,7 +331,7 @@ _setvbuf(stream); stream->ungetc_chars = 0; - + list_append(&stream->link, &files); - + return stream; } @@ -345,5 +345,5 @@ return NULL; } - + stream->fd = fd; stream->pos = 0; @@ -355,7 +355,7 @@ _setvbuf(stream); stream->ungetc_chars = 0; - + list_append(&stream->link, &files); - + return stream; } @@ -365,20 +365,20 @@ { errno_t rc = 0; - + fflush(stream); - + if (stream->sess != NULL) async_hangup(stream->sess); - + if (stream->fd >= 0) rc = vfs_put(stream->fd); - + list_remove(&stream->link); - + if (rc != EOK) { errno = rc; return EOF; } - + return 0; } @@ -387,10 +387,10 @@ { int rc = _fclose_nofree(stream); - + if ((stream != &stdin_null) && (stream != &stdout_kio) && (stream != &stderr_kio)) free(stream); - + return rc; } @@ -399,10 +399,10 @@ { FILE *nstr; - + if (path == NULL) { /* Changing mode is not supported */ return NULL; } - + (void) _fclose_nofree(stream); nstr = fopen(path, mode); @@ -411,11 +411,11 @@ return NULL; } - + list_remove(&nstr->link); *stream = *nstr; list_append(&stream->link, &files); - + free(nstr); - + return stream; } @@ -659,10 +659,10 @@ return 0; /* Errno set by _fallocbuf(). */ } - + data = (uint8_t *) buf; bytes_left = size * nmemb; total_written = 0; need_flush = false; - + while ((!stream->error) && (bytes_left > 0)) { buf_free = stream->buf_size - (stream->buf_head - stream->buf); @@ -671,13 +671,13 @@ else now = bytes_left; - + for (i = 0; i < now; i++) { b = data[i]; stream->buf_head[i] = b; - + if ((b == '\n') && (stream->btype == _IOLBF)) need_flush = true; } - + data += now; stream->buf_head += now; @@ -686,5 +686,5 @@ total_written += now; stream->buf_state = _bs_write; - + if (buf_free == 0) { /* Only need to drain buffer. */ @@ -697,5 +697,5 @@ if (need_flush) fflush(stream); - + return (total_written / size); } @@ -705,14 +705,14 @@ char buf[STR_BOUNDS(1)]; size_t sz = 0; - + if (chr_encode(c, buf, &sz, STR_BOUNDS(1)) == EOK) { size_t wr = fwrite(buf, 1, sz, stream); - + if (wr < sz) return EOF; - + return (int) c; } - + return EOF; } @@ -739,5 +739,5 @@ { char c; - + /* This could be made faster by only flushing when needed. */ if (stdout) @@ -745,8 +745,8 @@ if (stderr) fflush(stderr); - + if (fread(&c, sizeof(char), 1, stream) < sizeof(char)) return EOF; - + return (int) c; } @@ -841,5 +841,5 @@ if (stream->error) return EOF; - + _fflushbuf(stream); if (stream->error) { @@ -876,5 +876,5 @@ if (stream->error) return EOF; - + _fflushbuf(stream); if (stream->error) { @@ -882,10 +882,10 @@ return EOF; } - + if (stream->kio) { kio_update(); return 0; } - + if ((stream->fd >= 0) && (stream->need_sync)) { errno_t rc; @@ -904,5 +904,5 @@ return 0; } - + return 0; } @@ -930,5 +930,5 @@ return EOF; } - + return stream->fd; } @@ -939,8 +939,8 @@ if (stream->sess == NULL) stream->sess = vfs_fd_session(stream->fd, iface); - + return stream->sess; } - + return NULL; } @@ -952,5 +952,5 @@ return EOK; } - + return ENOENT; } Index: uspace/lib/c/generic/io/kio.c =================================================================== --- uspace/lib/c/generic/io/kio.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/kio.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -46,5 +46,5 @@ { errno_t rc = (errno_t) __SYSCALL3(SYS_KIO, KIO_WRITE, (sysarg_t) buf, size); - + if (rc == EOK) *nwritten = size; @@ -73,9 +73,9 @@ va_list args; va_start(args, fmt); - + int ret = kio_vprintf(fmt, args); - + va_end(args); - + return ret; } @@ -84,5 +84,5 @@ { size_t wr; - + wr = 0; (void) kio_write(str, size, &wr); @@ -95,16 +95,16 @@ size_t chars = 0; size_t wr; - + while (offset < size) { char buf[STR_BOUNDS(1)]; size_t sz = 0; - + if (chr_encode(str[chars], buf, &sz, STR_BOUNDS(1)) == EOK) kio_write(buf, sz, &wr); - + chars++; offset += sizeof(wchar_t); } - + return chars; } @@ -125,5 +125,5 @@ NULL }; - + return printf_core(fmt, &ps, ap); } Index: uspace/lib/c/generic/io/output.c =================================================================== --- uspace/lib/c/generic/io/output.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/output.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -45,5 +45,5 @@ errno_t ret = async_req_0_0(exch, OUTPUT_YIELD); async_exchange_end(exch); - + return ret; } @@ -54,5 +54,5 @@ errno_t ret = async_req_0_0(exch, OUTPUT_CLAIM); async_exchange_end(exch); - + return ret; } @@ -63,5 +63,5 @@ errno_t ret = async_req_0_2(exch, OUTPUT_GET_DIMENSIONS, maxx, maxy); async_exchange_end(exch); - + return ret; } @@ -70,13 +70,13 @@ { async_exch_t *exch = async_exchange_begin(sess); - + sysarg_t rv; errno_t ret = async_req_0_1(exch, OUTPUT_GET_CAPS, &rv); - + async_exchange_end(exch); - + if (ret == EOK) *ccaps = (console_caps_t) rv; - + return ret; } @@ -86,18 +86,18 @@ { async_exch_t *exch = async_exchange_begin(sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, OUTPUT_FRONTBUF_CREATE, &answer); errno_t rc = async_share_out_start(exch, frontbuf, AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE); - + async_exchange_end(exch); - + errno_t ret; async_wait_for(req, &ret); - + if ((rc != EOK) || (ret != EOK)) return 0; - + return (frontbuf_handle_t) IPC_GET_ARG1(answer); } @@ -108,5 +108,5 @@ errno_t ret = async_req_1_0(exch, OUTPUT_SET_STYLE, style); async_exchange_end(exch); - + return ret; } @@ -117,5 +117,5 @@ errno_t ret = async_req_1_0(exch, OUTPUT_CURSOR_UPDATE, frontbuf); async_exchange_end(exch); - + return ret; } @@ -126,5 +126,5 @@ errno_t ret = async_req_1_0(exch, OUTPUT_UPDATE, frontbuf); async_exchange_end(exch); - + return ret; } @@ -137,5 +137,5 @@ cols, rows); async_exchange_end(exch); - + return ret; } Index: uspace/lib/c/generic/io/printf.c =================================================================== --- uspace/lib/c/generic/io/printf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/printf.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -48,9 +48,9 @@ va_list args; va_start(args, fmt); - + int ret = vfprintf(stream, fmt, args); - + va_end(args); - + return ret; } @@ -67,9 +67,9 @@ va_list args; va_start(args, fmt); - + int ret = vprintf(fmt, args); - + va_end(args); - + return ret; } Index: uspace/lib/c/generic/io/printf_core.c =================================================================== --- uspace/lib/c/generic/io/printf_core.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/printf_core.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -211,5 +211,5 @@ if (str == NULL) return printf_putnchars(nullstr, str_size(nullstr), ps); - + return ps->str_write((void *) str, str_size(str), ps->data); } @@ -227,5 +227,5 @@ if (!ascii_check(ch)) return ps->str_write((void *) &invalch, 1, ps->data); - + return ps->str_write(&ch, 1, ps->data); } @@ -243,5 +243,5 @@ if (!chr_check(ch)) return ps->str_write((void *) &invalch, 1, ps->data); - + return ps->wstr_write(&ch, sizeof(wchar_t), ps->data); } @@ -269,8 +269,8 @@ } } - + if (printf_putchar(ch, ps) > 0) counter++; - + while (--width > 0) { /* @@ -281,5 +281,5 @@ counter++; } - + return (int) (counter); } @@ -307,8 +307,8 @@ } } - + if (printf_putwchar(ch, ps) > 0) counter++; - + while (--width > 0) { /* @@ -319,5 +319,5 @@ counter++; } - + return (int) (counter); } @@ -337,5 +337,5 @@ if (str == NULL) return printf_putstr(nullstr, ps); - + size_t strw = str_length(str); @@ -343,5 +343,5 @@ if ((precision == 0) || (precision > strw)) precision = strw; - + /* Left padding */ size_t counter = 0; @@ -353,5 +353,5 @@ } } - + /* Part of @a str fitting into the alloted space. */ int retval; @@ -386,5 +386,5 @@ if (str == NULL) return printf_putstr(nullstr, ps); - + size_t strw = wstr_length(str); @@ -392,5 +392,5 @@ if ((precision == 0) || (precision > strw)) precision = strw; - + /* Left padding */ size_t counter = 0; @@ -402,5 +402,5 @@ } } - + /* Part of @a wstr fitting into the alloted space. */ int retval; @@ -408,7 +408,7 @@ if ((retval = printf_wputnchars(str, size, ps)) < 0) return -counter; - + counter += retval; - + /* Right padding */ while (width-- > 0) { @@ -440,5 +440,5 @@ precision = 0; } - + const char *digits; if (flags & __PRINTF_FLAG_BIGCHARS) @@ -446,14 +446,14 @@ else digits = digits_small; - + char data[PRINT_NUMBER_BUFFER_SIZE]; char *ptr = &data[PRINT_NUMBER_BUFFER_SIZE - 1]; - + /* Size of number with all prefixes and signs */ int size = 0; - + /* Put zero at end of string */ *ptr-- = 0; - + if (num == 0) { *ptr-- = '0'; @@ -465,8 +465,8 @@ } while (num /= base); } - + /* Size of plain number */ int number_size = size; - + /* * Collect the sum of all prefixes/signs/etc. to calculate padding and @@ -487,5 +487,5 @@ } } - + char sgn = 0; if (flags & __PRINTF_FLAG_SIGNED) { @@ -501,8 +501,8 @@ } } - + if (flags & __PRINTF_FLAG_LEFTALIGNED) flags &= ~__PRINTF_FLAG_ZEROPADDED; - + /* * If the number is left-aligned or precision is specified then @@ -513,5 +513,5 @@ precision = width - size + number_size; } - + /* Print leading spaces */ if (number_size > precision) { @@ -519,8 +519,8 @@ precision = number_size; } - + width -= precision + size - number_size; size_t counter = 0; - + if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { while (width-- > 0) { @@ -529,5 +529,5 @@ } } - + /* Print sign */ if (sgn) { @@ -535,5 +535,5 @@ counter++; } - + /* Print prefix */ if (flags & __PRINTF_FLAG_PREFIX) { @@ -568,5 +568,5 @@ } } - + /* Print leading zeroes */ precision -= number_size; @@ -575,17 +575,17 @@ counter++; } - + /* Print the number itself */ int retval; if ((retval = printf_putstr(++ptr, ps)) > 0) counter += retval; - + /* Print trailing spaces */ - + while (width-- > 0) { if (printf_putchar(' ', ps) == 1) counter++; } - + return ((int) counter); } @@ -601,5 +601,5 @@ const int str_len = 3; const char *str; - + if (flags & __PRINTF_FLAG_BIGCHARS) { str = val.is_infinity ? "INF" : "NAN"; @@ -624,5 +624,5 @@ if ((ret = ps->str_write(&sign, 1, ps->data)) < 0) return -1; - + counter += ret; } @@ -630,5 +630,5 @@ if ((ret = ps->str_write(str, str_len, ps->data)) < 0) return -1; - + counter += ret; @@ -751,5 +751,5 @@ if ((ret = ps->str_write(&sign, 1, ps->data)) < 0) return -1; - + counter += ret; } @@ -783,5 +783,5 @@ counter += ret; - + /* Print the decimal point and the fractional part. */ if (has_decimal_pt) { @@ -790,5 +790,5 @@ if ((ret = ps->str_write(&ch, 1, ps->data)) < 0) return -1; - + counter += ret; @@ -885,5 +885,5 @@ /* Let the implementation figure out the proper precision. */ val_str.len = double_to_short_str(val, buf, buf_size, &val_str.dec_exp); - + /* Precision needed for the last significant digit. */ precision = max(0, -val_str.dec_exp); @@ -903,5 +903,5 @@ if ((ret = ps->str_write(&exp_ch, 1, ps->data)) < 0) return -1; - + counter += ret; @@ -915,5 +915,5 @@ /* Print the exponent. */ exp_val = abs(exp_val); - + char exp_str[4] = { 0 }; @@ -921,5 +921,5 @@ exp_str[1] = '0' + (exp_val % 100) / 10 ; exp_str[2] = '0' + (exp_val % 10); - + int exp_len = (exp_str[0] == '0') ? 2 : 3; const char *exp_str_start = &exp_str[3] - exp_len; @@ -981,5 +981,5 @@ if ((ret = ps->str_write(&sign, 1, ps->data)) < 0) return -1; - + counter += ret; } @@ -1004,5 +1004,5 @@ if ((ret = ps->str_write(&ch, 1, ps->data)) < 0) return -1; - + counter += ret; @@ -1104,5 +1104,5 @@ /* Let the implementation figure out the proper precision. */ val_str.len = double_to_short_str(val, buf, buf_size, &val_str.dec_exp); - + /* Use all produced digits. */ precision = val_str.len - 1; @@ -1223,5 +1223,5 @@ precision = (precision < 0) ? 6 : precision; return print_double_fixed(g, precision, width, flags, ps); - + case 'E': flags |= __PRINTF_FLAG_BIGCHARS; @@ -1230,5 +1230,5 @@ precision = (precision < 0) ? 6 : precision; return print_double_scientific(g, precision, width, flags, ps); - + case 'G': flags |= __PRINTF_FLAG_BIGCHARS; @@ -1236,5 +1236,5 @@ case 'g': return print_double_generic(g, precision, width, flags, ps); - + default: assert(false); @@ -1337,15 +1337,15 @@ size_t nxt = 0; /* Index of the next character from fmt */ size_t j = 0; /* Index to the first not printed nonformating character */ - + size_t counter = 0; /* Number of characters printed */ int retval; /* Return values from nested functions */ - + while (true) { i = nxt; wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT); - + if (uc == 0) break; - + /* Control character */ if (uc == '%') { @@ -1359,11 +1359,11 @@ counter += retval; } - + j = i; - + /* Parse modifiers */ uint32_t flags = 0; bool end = false; - + do { i = nxt; @@ -1390,5 +1390,5 @@ }; } while (!end); - + /* Width & '*' operator */ int width = 0; @@ -1397,5 +1397,5 @@ width *= 10; width += uc - '0'; - + i = nxt; uc = str_decode(fmt, &nxt, STR_NO_LIMIT); @@ -1416,5 +1416,5 @@ } } - + /* Precision and '*' operator */ int precision = -1; @@ -1427,5 +1427,5 @@ precision *= 10; precision += uc - '0'; - + i = nxt; uc = str_decode(fmt, &nxt, STR_NO_LIMIT); @@ -1446,7 +1446,7 @@ } } - + qualifier_t qualifier; - + switch (uc) { case 't': @@ -1495,7 +1495,7 @@ qualifier = PrintfQualifierInt; } - + unsigned int base = 10; - + switch (uc) { /* @@ -1504,15 +1504,15 @@ case 's': precision = max(0, precision); - + if (qualifier == PrintfQualifierLong) retval = print_wstr(va_arg(ap, wchar_t *), width, precision, flags, ps); else retval = print_str(va_arg(ap, char *), width, precision, flags, ps); - + if (retval < 0) { counter = -counter; goto out; } - + counter += retval; j = nxt; @@ -1523,14 +1523,14 @@ else retval = print_char(va_arg(ap, unsigned int), width, flags, ps); - + if (retval < 0) { counter = -counter; goto out; }; - + counter += retval; j = nxt; goto next_char; - + /* * Floating point values @@ -1544,14 +1544,14 @@ retval = print_double(va_arg(ap, double), uc, precision, width, flags, ps); - + if (retval < 0) { counter = -counter; goto out; } - + counter += retval; j = nxt; goto next_char; - + /* * Integer values @@ -1585,10 +1585,10 @@ base = 16; break; - + /* Percentile itself */ case '%': j = i; goto next_char; - + /* * Bad formatting. @@ -1601,9 +1601,9 @@ goto next_char; } - + /* Print integers */ size_t size; uint64_t number; - + switch (qualifier) { case PrintfQualifierByte: @@ -1645,5 +1645,5 @@ goto out; } - + if ((retval = print_number(number, width, precision, base, flags, ps)) < 0) { @@ -1651,5 +1651,5 @@ goto out; } - + counter += retval; j = nxt; @@ -1658,5 +1658,5 @@ ; } - + if (i > j) { if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) { @@ -1667,5 +1667,5 @@ counter += retval; } - + out: return ((int) counter); Index: uspace/lib/c/generic/io/snprintf.c =================================================================== --- uspace/lib/c/generic/io/snprintf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/snprintf.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -50,9 +50,9 @@ va_list args; va_start(args, fmt); - + int ret = vsnprintf(str, size, fmt, args); - + va_end(args); - + return ret; } Index: uspace/lib/c/generic/io/vprintf.c =================================================================== --- uspace/lib/c/generic/io/vprintf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/vprintf.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -52,13 +52,13 @@ size_t offset = 0; size_t chars = 0; - + while (offset < size) { if (fputc(str[chars], (FILE *) stream) <= 0) break; - + chars++; offset += sizeof(wchar_t); } - + return chars; } @@ -80,14 +80,14 @@ stream }; - + /* * Prevent other threads to execute printf_core() */ fibril_mutex_lock(&printf_mutex); - + int ret = printf_core(fmt, &ps, ap); - + fibril_mutex_unlock(&printf_mutex); - + return ret; } Index: uspace/lib/c/generic/io/vsnprintf.c =================================================================== --- uspace/lib/c/generic/io/vsnprintf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/vsnprintf.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -65,8 +65,8 @@ { size_t left = data->size - data->len; - + if (left == 0) return ((int) size); - + if (left == 1) { /* We have only one free byte left in buffer @@ -77,5 +77,5 @@ return ((int) size); } - + if (left <= size) { /* We do not have enough space for the whole string @@ -84,29 +84,29 @@ */ size_t index = 0; - + while (index < size) { wchar_t uc = str_decode(str, &index, size); - + if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK) break; } - + /* Put trailing zero at end, but not count it * into data->len so it could be rewritten next time */ data->dst[data->len] = 0; - + return ((int) size); } - + /* Buffer is big enough to print the whole string */ memcpy((void *)(data->dst + data->len), (void *) str, size); data->len += size; - + /* Put trailing zero at end, but not count it * into data->len so it could be rewritten next time */ data->dst[data->len] = 0; - + return ((int) size); } @@ -132,11 +132,11 @@ { size_t index = 0; - + while (index < (size / sizeof(wchar_t))) { size_t left = data->size - data->len; - + if (left == 0) return ((int) size); - + if (left == 1) { /* We have only one free byte left in buffer @@ -147,16 +147,16 @@ return ((int) size); } - + if (chr_encode(str[index], data->dst, &data->len, data->size - 1) != EOK) break; - + index++; } - + /* Put trailing zero at end, but not count it * into data->len so it could be rewritten next time */ data->dst[data->len] = 0; - + return ((int) size); } @@ -174,9 +174,9 @@ &data }; - + /* Print 0 at end of string - fix the case that nothing will be printed */ if (size > 0) str[0] = 0; - + /* vsnprintf_write ensures that str will be terminated by zero. */ return printf_core(fmt, &ps, ap); Index: uspace/lib/c/generic/io/window.c =================================================================== --- uspace/lib/c/generic/io/window.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/window.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -46,5 +46,5 @@ errno_t ret = async_req_1_2(exch, WINDOW_REGISTER, flags, in, out); async_exchange_end(exch); - + return ret; } @@ -96,21 +96,21 @@ { async_exch_t *exch = async_exchange_begin(sess); - + ipc_call_t answer; aid_t req = async_send_5(exch, WINDOW_RESIZE, x, y, width, height, (sysarg_t) placement_flags, &answer); - + errno_t rc = async_share_out_start(exch, cells, AS_AREA_READ | AS_AREA_CACHEABLE); - + async_exchange_end(exch); - + errno_t ret; async_wait_for(req, &ret); - + if (rc != EOK) return rc; else if (ret != EOK) return ret; - + return EOK; } Index: uspace/lib/c/generic/ipc.c =================================================================== --- uspace/lib/c/generic/ipc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/ipc.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -56,5 +56,5 @@ ipc_async_callback_t callback; void *private; - + struct { ipc_call_t data; @@ -78,11 +78,11 @@ if (callback) callback(private, ENOMEM, NULL); - + return NULL; } - + call->callback = callback; call->private = private; - + return call; } @@ -99,10 +99,10 @@ return; } - + if (rc != EOK) { /* Call asynchronous handler with error code */ if (call->callback) call->callback(call->private, ENOENT, NULL); - + free(call); return; @@ -135,8 +135,8 @@ if (!call) return; - + errno_t rc = (errno_t) __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phandle, imethod, arg1, arg2, arg3, (sysarg_t) call); - + ipc_finish_async(rc, call); } @@ -167,5 +167,5 @@ if (!call) return; - + IPC_SET_IMETHOD(call->msg.data, imethod); IPC_SET_ARG1(call->msg.data, arg1); @@ -174,8 +174,8 @@ IPC_SET_ARG4(call->msg.data, arg4); IPC_SET_ARG5(call->msg.data, arg5); - + errno_t rc = (errno_t) __SYSCALL3(SYS_IPC_CALL_ASYNC_SLOW, phandle, (sysarg_t) &call->msg.data, (sysarg_t) call); - + ipc_finish_async(rc, call); } @@ -222,5 +222,5 @@ { ipc_call_t data; - + IPC_SET_RETVAL(data, retval); IPC_SET_ARG1(data, arg1); @@ -229,5 +229,5 @@ IPC_SET_ARG4(data, arg4); IPC_SET_ARG5(data, arg5); - + return (errno_t) __SYSCALL2(SYS_IPC_ANSWER_SLOW, chandle, (sysarg_t) &data); } @@ -261,5 +261,5 @@ { errno_t rc = (errno_t) __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, flags); - + /* Handle received answers */ if ((rc == EOK) && (call->cap_handle == CAP_NIL) && @@ -267,5 +267,5 @@ handle_answer(call); } - + return rc; } @@ -292,9 +292,9 @@ { errno_t rc; - + do { rc = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE); } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED)); - + return rc; } @@ -312,10 +312,10 @@ { errno_t rc; - + do { rc = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING); } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED)); - + return rc; } @@ -362,5 +362,5 @@ { ipc_call_t data; - + IPC_SET_IMETHOD(data, imethod); IPC_SET_ARG1(data, arg1); @@ -369,5 +369,5 @@ IPC_SET_ARG4(data, arg4); IPC_SET_ARG5(data, arg5); - + return (errno_t) __SYSCALL4(SYS_IPC_FORWARD_SLOW, chandle, phandle, (sysarg_t) &data, mode); Index: uspace/lib/c/generic/iplink.c =================================================================== --- uspace/lib/c/generic/iplink.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/iplink.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -53,9 +53,9 @@ if (iplink == NULL) return ENOMEM; - + iplink->sess = sess; iplink->ev_ops = ev_ops; iplink->arg = arg; - + async_exch_t *exch = async_exchange_begin(sess); @@ -63,17 +63,17 @@ errno_t rc = async_create_callback_port(exch, INTERFACE_IPLINK_CB, 0, 0, iplink_cb_conn, iplink, &port); - - async_exchange_end(exch); - + + async_exchange_end(exch); + if (rc != EOK) goto error; - + *riplink = iplink; return EOK; - + error: if (iplink != NULL) free(iplink); - + return rc; } @@ -88,21 +88,21 @@ { async_exch_t *exch = async_exchange_begin(iplink->sess); - + ipc_call_t answer; aid_t req = async_send_2(exch, IPLINK_SEND, (sysarg_t) sdu->src, (sysarg_t) sdu->dest, &answer); - + errno_t rc = async_data_write_start(exch, sdu->data, sdu->size); - - async_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - - errno_t retval; - async_wait_for(req, &retval); - + + async_exchange_end(exch); + + if (rc != EOK) { + async_forget(req); + return rc; + } + + errno_t retval; + async_wait_for(req, &retval); + return retval; } @@ -111,8 +111,8 @@ { async_exch_t *exch = async_exchange_begin(iplink->sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, IPLINK_SEND6, &answer); - + errno_t rc = async_data_write_start(exch, &sdu->dest, sizeof(addr48_t)); if (rc != EOK) { @@ -121,17 +121,17 @@ return rc; } - + rc = async_data_write_start(exch, sdu->data, sdu->size); - - async_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - - errno_t retval; - async_wait_for(req, &retval); - + + async_exchange_end(exch); + + if (rc != EOK) { + async_forget(req); + return rc; + } + + errno_t retval; + async_wait_for(req, &retval); + return retval; } @@ -140,13 +140,13 @@ { async_exch_t *exch = async_exchange_begin(iplink->sess); - + sysarg_t mtu; errno_t rc = async_req_0_1(exch, IPLINK_GET_MTU, &mtu); - - async_exchange_end(exch); - + + async_exchange_end(exch); + if (rc != EOK) return rc; - + *rmtu = mtu; return EOK; @@ -156,20 +156,20 @@ { async_exch_t *exch = async_exchange_begin(iplink->sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, IPLINK_GET_MAC48, &answer); - + errno_t rc = async_data_read_start(exch, mac, sizeof(addr48_t)); - + loc_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - - errno_t retval; - async_wait_for(req, &retval); - + + if (rc != EOK) { + async_forget(req); + return rc; + } + + errno_t retval; + async_wait_for(req, &retval); + return retval; } @@ -178,20 +178,20 @@ { async_exch_t *exch = async_exchange_begin(iplink->sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, IPLINK_GET_MAC48, &answer); - + errno_t rc = async_data_read_start(exch, mac, sizeof(addr48_t)); - + loc_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - - errno_t retval; - async_wait_for(req, &retval); - + + if (rc != EOK) { + async_forget(req); + return rc; + } + + errno_t retval; + async_wait_for(req, &retval); + return retval; } @@ -201,19 +201,19 @@ { async_exch_t *exch = async_exchange_begin(iplink->sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, IPLINK_ADDR_ADD, &answer); - + errno_t rc = async_data_write_start(exch, addr, sizeof(inet_addr_t)); async_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - - errno_t retval; - async_wait_for(req, &retval); - + + if (rc != EOK) { + async_forget(req); + return rc; + } + + errno_t retval; + async_wait_for(req, &retval); + return retval; } @@ -222,19 +222,19 @@ { async_exch_t *exch = async_exchange_begin(iplink->sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, IPLINK_ADDR_REMOVE, &answer); - + errno_t rc = async_data_write_start(exch, addr, sizeof(inet_addr_t)); async_exchange_end(exch); - - if (rc != EOK) { - async_forget(req); - return rc; - } - - errno_t retval; - async_wait_for(req, &retval); - + + if (rc != EOK) { + async_forget(req); + return rc; + } + + errno_t retval; + async_wait_for(req, &retval); + return retval; } @@ -249,7 +249,7 @@ { iplink_recv_sdu_t sdu; - + ip_ver_t ver = IPC_GET_ARG1(*icall); - + errno_t rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size); @@ -258,5 +258,5 @@ return; } - + rc = iplink->ev_ops->recv(iplink, &sdu, ver); free(sdu.data); @@ -269,5 +269,5 @@ addr48_t *addr; size_t size; - + errno_t rc = async_data_write_accept((void **)&addr, false, sizeof(addr48_t), sizeof(addr48_t), 0, &size); @@ -285,14 +285,14 @@ { iplink_t *iplink = (iplink_t *) arg; - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { /* TODO: Handle hangup */ return; } - + switch (IPC_GET_IMETHOD(call)) { case IPLINK_EV_RECV: Index: uspace/lib/c/generic/iplink_srv.c =================================================================== --- uspace/lib/c/generic/iplink_srv.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/iplink_srv.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -59,5 +59,5 @@ return; } - + ipc_callid_t callid; size_t size; @@ -67,5 +67,5 @@ return; } - + if (size != sizeof(addr48_t)) { async_answer_0(callid, EINVAL); @@ -73,9 +73,9 @@ return; } - + rc = async_data_read_finalize(callid, &mac, size); if (rc != EOK) async_answer_0(callid, rc); - + async_answer_0(iid, rc); } @@ -99,9 +99,9 @@ return; } - + rc = async_data_read_finalize(callid, &mac, sizeof(addr48_t)); if (rc != EOK) async_answer_0(callid, rc); - + async_answer_0(iid, rc); } @@ -117,5 +117,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -123,5 +123,5 @@ return; } - + inet_addr_t addr; errno_t rc = async_data_write_finalize(callid, &addr, size); @@ -130,5 +130,5 @@ async_answer_0(iid, rc); } - + rc = srv->ops->addr_add(srv, &addr); async_answer_0(iid, rc); @@ -145,5 +145,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -151,5 +151,5 @@ return; } - + inet_addr_t addr; errno_t rc = async_data_write_finalize(callid, &addr, size); @@ -158,5 +158,5 @@ async_answer_0(iid, rc); } - + rc = srv->ops->addr_remove(srv, &addr); async_answer_0(iid, rc); @@ -167,8 +167,8 @@ { iplink_sdu_t sdu; - + sdu.src = IPC_GET_ARG1(*icall); sdu.dest = IPC_GET_ARG2(*icall); - + errno_t rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size); @@ -177,5 +177,5 @@ return; } - + rc = srv->ops->send(srv, &sdu); free(sdu.data); @@ -187,5 +187,5 @@ { iplink_sdu6_t sdu; - + ipc_callid_t callid; size_t size; @@ -195,5 +195,5 @@ return; } - + if (size != sizeof(addr48_t)) { async_answer_0(callid, EINVAL); @@ -201,5 +201,5 @@ return; } - + errno_t rc = async_data_write_finalize(callid, &sdu.dest, size); if (rc != EOK) { @@ -207,5 +207,5 @@ async_answer_0(iid, rc); } - + rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size); @@ -214,5 +214,5 @@ return; } - + rc = srv->ops->send6(srv, &sdu); free(sdu.data); @@ -233,5 +233,5 @@ iplink_srv_t *srv = (iplink_srv_t *) arg; errno_t rc; - + fibril_mutex_lock(&srv->lock); if (srv->connected) { @@ -240,26 +240,26 @@ return EBUSY; } - + srv->connected = true; fibril_mutex_unlock(&srv->lock); - + /* Accept the connection */ async_answer_0(iid, EOK); - + async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE); if (sess == NULL) return ENOMEM; - + srv->client_sess = sess; - + rc = srv->ops->open(srv); if (rc != EOK) return rc; - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); sysarg_t method = IPC_GET_IMETHOD(call); - + if (!method) { /* The other side has hung up */ @@ -270,5 +270,5 @@ break; } - + switch (method) { case IPLINK_GET_MTU: @@ -297,5 +297,5 @@ } } - + return srv->ops->close(srv); } @@ -306,24 +306,24 @@ if (srv->client_sess == NULL) return EIO; - + async_exch_t *exch = async_exchange_begin(srv->client_sess); - + ipc_call_t answer; aid_t req = async_send_1(exch, IPLINK_EV_RECV, (sysarg_t)ver, &answer); - + errno_t rc = async_data_write_start(exch, sdu->data, sdu->size); async_exchange_end(exch); - + if (rc != EOK) { async_forget(req); return rc; } - + errno_t retval; async_wait_for(req, &retval); if (retval != EOK) return retval; - + return EOK; } @@ -333,23 +333,23 @@ if (srv->client_sess == NULL) return EIO; - + async_exch_t *exch = async_exchange_begin(srv->client_sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, IPLINK_EV_CHANGE_ADDR, &answer); - + errno_t rc = async_data_write_start(exch, addr, sizeof(addr48_t)); async_exchange_end(exch); - + if (rc != EOK) { async_forget(req); return rc; } - + errno_t retval; async_wait_for(req, &retval); if (retval != EOK) return retval; - + return EOK; } Index: uspace/lib/c/generic/irq.c =================================================================== --- uspace/lib/c/generic/irq.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/irq.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -68,5 +68,5 @@ if (ucode == NULL) ucode = &default_ucode; - + return (errno_t) __SYSCALL4(SYS_IPC_IRQ_SUBSCRIBE, inr, method, (sysarg_t) ucode, (sysarg_t) out_handle); Index: uspace/lib/c/generic/libc.c =================================================================== --- uspace/lib/c/generic/libc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/libc.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -70,8 +70,8 @@ /* Initialize user task run-time environment */ __malloc_init(); - + /* Save the PCB pointer */ __pcb = (pcb_t *) pcb_ptr; - + #ifdef CONFIG_RTLD if (__pcb != NULL && __pcb->rtld_runtime != NULL) { @@ -82,24 +82,24 @@ } #endif - + fibril_t *fibril = fibril_setup(); if (fibril == NULL) abort(); - + __tcb_set(fibril->tcb); - - + + #ifdef FUTEX_UPGRADABLE rcu_register_fibril(); #endif - + __async_init(); - + /* The basic run-time environment is setup */ env_setup = true; - + int argc; char **argv; - + /* * Get command line arguments and initialize @@ -118,5 +118,5 @@ (void) vfs_cwd_set(__pcb->cwd); } - + /* * Run main() and set task return value @@ -134,7 +134,7 @@ fibril_teardown(__tcb_get()->fibril_data, false); } - + __SYSCALL1(SYS_TASK_EXIT, false); - + /* Unreachable */ while (1); @@ -144,5 +144,5 @@ { __SYSCALL1(SYS_TASK_EXIT, true); - + /* Unreachable */ while (1); Index: uspace/lib/c/generic/loader.c =================================================================== --- uspace/lib/c/generic/loader.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/loader.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -65,5 +65,5 @@ if (ldr == NULL) return NULL; - + async_sess_t *sess = service_connect_blocking(SERVICE_LOADER, INTERFACE_LOADER, 0); @@ -72,5 +72,5 @@ return NULL; } - + ldr->sess = sess; return ldr; @@ -91,16 +91,16 @@ /* Get task ID. */ async_exch_t *exch = async_exchange_begin(ldr->sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, LOADER_GET_TASKID, &answer); errno_t rc = async_data_read_start(exch, task_id, sizeof(task_id_t)); - - async_exchange_end(exch); - + + async_exchange_end(exch); + if (rc != EOK) { async_forget(req); return (errno_t) rc; } - + async_wait_for(req, &rc); return (errno_t) rc; @@ -121,24 +121,24 @@ if (!cwd) return ENOMEM; - + if (vfs_cwd_get(cwd, MAX_PATH_LEN + 1) != EOK) str_cpy(cwd, MAX_PATH_LEN + 1, "/"); - + size_t len = str_length(cwd); - - async_exch_t *exch = async_exchange_begin(ldr->sess); - + + async_exch_t *exch = async_exchange_begin(ldr->sess); + ipc_call_t answer; aid_t req = async_send_0(exch, LOADER_SET_CWD, &answer); errno_t rc = async_data_write_start(exch, cwd, len); - + async_exchange_end(exch); free(cwd); - + if (rc != EOK) { async_forget(req); return (errno_t) rc; } - + async_wait_for(req, &rc); return (errno_t) rc; @@ -195,5 +195,5 @@ name++; } - + int fd; errno_t rc = vfs_lookup(path, 0, &fd); @@ -201,5 +201,5 @@ return rc; } - + rc = loader_set_program(ldr, name, fd); vfs_put(fd); @@ -232,13 +232,13 @@ ap++; } - + char *arg_buf = malloc(buffer_size); if (arg_buf == NULL) return ENOMEM; - + /* Now fill the buffer with null-terminated argument strings */ ap = argv; char *dp = arg_buf; - + while (*ap != NULL) { str_cpy(dp, buffer_size - (dp - arg_buf), *ap); @@ -246,21 +246,21 @@ ap++; } - + /* Send serialized arguments to the loader */ async_exch_t *exch = async_exchange_begin(ldr->sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, LOADER_SET_ARGS, &answer); errno_t rc = async_data_write_start(exch, (void *) arg_buf, buffer_size); - + async_exchange_end(exch); free(arg_buf); - + if (rc != EOK) { async_forget(req); return (errno_t) rc; } - + async_wait_for(req, &rc); return (errno_t) rc; @@ -280,15 +280,15 @@ async_exch_t *exch = async_exchange_begin(ldr->sess); async_exch_t *vfs_exch = vfs_exchange_begin(); - + aid_t req = async_send_0(exch, LOADER_ADD_INBOX, NULL); - + errno_t rc = async_data_write_start(exch, name, str_size(name) + 1); if (rc == EOK) { rc = vfs_pass_handle(vfs_exch, file, exch); } - + async_exchange_end(vfs_exch); async_exchange_end(exch); - + if (rc == EOK) { async_wait_for(req, &rc); @@ -296,5 +296,5 @@ async_forget(req); } - + return (errno_t) rc; } @@ -315,5 +315,5 @@ errno_t rc = async_req_0_0(exch, LOADER_LOAD); async_exchange_end(exch); - + return rc; } @@ -338,11 +338,11 @@ errno_t rc = async_req_0_0(exch, LOADER_RUN); async_exchange_end(exch); - + if (rc != EOK) return rc; - + async_hangup(ldr->sess); free(ldr); - + return EOK; } Index: uspace/lib/c/generic/loc.c =================================================================== --- uspace/lib/c/generic/loc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/loc.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -60,10 +60,10 @@ ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { /* TODO: Handle hangup */ return; } - + switch (IPC_GET_IMETHOD(call)) { case LOC_EVENT_CAT_CHANGE: @@ -71,10 +71,10 @@ loc_cat_change_cb_t cb_fun = cat_change_cb; fibril_mutex_unlock(&loc_callback_mutex); - + async_answer_0(callid, EOK); - + if (cb_fun != NULL) (*cb_fun)(); - + break; default: @@ -89,8 +89,8 @@ { fibril_mutex_lock(mtx); - + if ((*dst == NULL) && (src != NULL)) *dst = src; - + fibril_mutex_unlock(mtx); } @@ -108,25 +108,25 @@ async_exch_t *exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER); - + ipc_call_t answer; aid_t req = async_send_0(exch, LOC_CALLBACK_CREATE, &answer); - + port_id_t port; errno_t rc = async_create_callback_port(exch, INTERFACE_LOC_CB, 0, 0, loc_cb_conn, NULL, &port); - + loc_exchange_end(exch); - + if (rc != EOK) return rc; - + errno_t retval; async_wait_for(req, &retval); if (retval != EOK) return retval; - + loc_callback_created = true; } - + return EOK; } @@ -144,9 +144,9 @@ case INTERFACE_LOC_SUPPLIER: fibril_mutex_lock(&loc_supp_block_mutex); - + while (loc_supp_block_sess == NULL) { clone_session(&loc_supplier_mutex, loc_supplier_sess, &loc_supp_block_sess); - + if (loc_supp_block_sess == NULL) loc_supp_block_sess = @@ -154,18 +154,18 @@ INTERFACE_LOC_SUPPLIER, 0); } - + fibril_mutex_unlock(&loc_supp_block_mutex); - + clone_session(&loc_supplier_mutex, loc_supp_block_sess, &loc_supplier_sess); - + return async_exchange_begin(loc_supp_block_sess); case INTERFACE_LOC_CONSUMER: fibril_mutex_lock(&loc_cons_block_mutex); - + while (loc_cons_block_sess == NULL) { clone_session(&loc_consumer_mutex, loc_consumer_sess, &loc_cons_block_sess); - + if (loc_cons_block_sess == NULL) loc_cons_block_sess = @@ -173,10 +173,10 @@ INTERFACE_LOC_CONSUMER, 0); } - + fibril_mutex_unlock(&loc_cons_block_mutex); - + clone_session(&loc_consumer_mutex, loc_cons_block_sess, &loc_consumer_sess); - + return async_exchange_begin(loc_cons_block_sess); default: @@ -197,29 +197,29 @@ case INTERFACE_LOC_SUPPLIER: fibril_mutex_lock(&loc_supplier_mutex); - + if (loc_supplier_sess == NULL) loc_supplier_sess = service_connect(SERVICE_LOC, INTERFACE_LOC_SUPPLIER, 0); - + fibril_mutex_unlock(&loc_supplier_mutex); - + if (loc_supplier_sess == NULL) return NULL; - + return async_exchange_begin(loc_supplier_sess); case INTERFACE_LOC_CONSUMER: fibril_mutex_lock(&loc_consumer_mutex); - + if (loc_consumer_sess == NULL) loc_consumer_sess = service_connect(SERVICE_LOC, INTERFACE_LOC_CONSUMER, 0); - + fibril_mutex_unlock(&loc_consumer_mutex); - + if (loc_consumer_sess == NULL) return NULL; - + return async_exchange_begin(loc_consumer_sess); default: @@ -242,9 +242,9 @@ { async_exch_t *exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); - + ipc_call_t answer; aid_t req = async_send_2(exch, LOC_SERVER_REGISTER, 0, 0, &answer); errno_t retval = async_data_write_start(exch, name, str_size(name)); - + if (retval != EOK) { async_forget(req); @@ -252,5 +252,5 @@ return retval; } - + async_connect_to_me(exch, 0, 0, 0); @@ -262,5 +262,5 @@ async_wait_for(req, &retval); loc_exchange_end(exch); - + return retval; } @@ -275,9 +275,9 @@ { async_exch_t *exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); - + ipc_call_t answer; aid_t req = async_send_0(exch, LOC_SERVICE_REGISTER, &answer); errno_t retval = async_data_write_start(exch, fqsn, str_size(fqsn)); - + if (retval != EOK) { async_forget(req); @@ -285,5 +285,5 @@ return retval; } - + /* * First wait for the answer and then end the exchange. The opposite @@ -293,15 +293,15 @@ async_wait_for(req, &retval); loc_exchange_end(exch); - + if (retval != EOK) { if (sid != NULL) *sid = -1; - - return retval; - } - + + return retval; + } + if (sid != NULL) *sid = (service_id_t) IPC_GET_ARG1(answer); - + return retval; } @@ -315,9 +315,9 @@ async_exch_t *exch; errno_t retval; - + exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); retval = async_req_1_0(exch, LOC_SERVICE_UNREGISTER, sid); loc_exchange_end(exch); - + return (errno_t)retval; } @@ -327,5 +327,5 @@ { async_exch_t *exch; - + if (flags & IPC_FLAG_BLOCKING) exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER); @@ -335,29 +335,29 @@ return errno; } - + ipc_call_t answer; aid_t req = async_send_2(exch, LOC_SERVICE_GET_ID, flags, 0, &answer); errno_t retval = async_data_write_start(exch, fqdn, str_size(fqdn)); - - loc_exchange_end(exch); - + + loc_exchange_end(exch); + if (retval != EOK) { async_forget(req); return retval; } - + async_wait_for(req, &retval); - + if (retval != EOK) { if (handle != NULL) *handle = (service_id_t) -1; - - return retval; - } - + + return retval; + } + if (handle != NULL) *handle = (service_id_t) IPC_GET_ARG1(answer); - + return retval; } @@ -380,8 +380,8 @@ size_t act_size; errno_t dretval; - + *name = NULL; exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER); - + ipc_call_t answer; aid_t req = async_send_1(exch, method, id, &answer); @@ -389,18 +389,18 @@ &dreply); async_wait_for(dreq, &dretval); - - loc_exchange_end(exch); - + + loc_exchange_end(exch); + if (dretval != EOK) { async_forget(req); return dretval; } - + errno_t retval; async_wait_for(req, &retval); - + if (retval != EOK) return retval; - + act_size = IPC_GET_ARG2(dreply); assert(act_size <= LOC_NAME_MAXLEN); @@ -410,5 +410,5 @@ if (*name == NULL) return ENOMEM; - + return EOK; } @@ -460,5 +460,5 @@ { async_exch_t *exch; - + if (flags & IPC_FLAG_BLOCKING) exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER); @@ -468,29 +468,29 @@ return errno; } - + ipc_call_t answer; aid_t req = async_send_2(exch, LOC_NAMESPACE_GET_ID, flags, 0, &answer); errno_t retval = async_data_write_start(exch, name, str_size(name)); - - loc_exchange_end(exch); - + + loc_exchange_end(exch); + if (retval != EOK) { async_forget(req); return retval; } - + async_wait_for(req, &retval); - + if (retval != EOK) { if (handle != NULL) *handle = (service_id_t) -1; - - return retval; - } - + + return retval; + } + if (handle != NULL) *handle = (service_id_t) IPC_GET_ARG1(answer); - + return retval; } @@ -509,5 +509,5 @@ { async_exch_t *exch; - + if (flags & IPC_FLAG_BLOCKING) exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER); @@ -517,29 +517,29 @@ return errno; } - + ipc_call_t answer; aid_t req = async_send_0(exch, LOC_CATEGORY_GET_ID, &answer); errno_t retval = async_data_write_start(exch, name, str_size(name)); - - loc_exchange_end(exch); - + + loc_exchange_end(exch); + if (retval != EOK) { async_forget(req); return retval; } - + async_wait_for(req, &retval); - + if (retval != EOK) { if (cat_id != NULL) *cat_id = (category_id_t) -1; - - return retval; - } - + + return retval; + } + if (cat_id != NULL) *cat_id = (category_id_t) IPC_GET_ARG1(answer); - + return retval; } @@ -549,13 +549,13 @@ { async_exch_t *exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER); - + sysarg_t type; errno_t retval = async_req_1_1(exch, LOC_ID_PROBE, handle, &type); - - loc_exchange_end(exch); - + + loc_exchange_end(exch); + if (retval != EOK) return LOC_OBJECT_NONE; - + return (loc_object_type_t) type; } @@ -565,10 +565,10 @@ { async_sess_t *sess; - + if (flags & IPC_FLAG_BLOCKING) sess = service_connect_blocking(SERVICE_LOC, iface, handle); else sess = service_connect(SERVICE_LOC, iface, handle); - + return sess; } @@ -580,13 +580,13 @@ { async_exch_t *exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER); - + sysarg_t null_id; errno_t retval = async_req_0_1(exch, LOC_NULL_CREATE, &null_id); - - loc_exchange_end(exch); - + + loc_exchange_end(exch); + if (retval != EOK) return -1; - + return (int) null_id; } @@ -605,5 +605,5 @@ if (retval != EOK) return 0; - + return count; } @@ -619,9 +619,9 @@ async_exch_t *exch; errno_t retval; - + exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); retval = async_req_2_0(exch, LOC_SERVICE_ADD_TO_CAT, svc_id, cat_id); loc_exchange_end(exch); - + return retval; } @@ -635,5 +635,5 @@ if (retval != EOK) return 0; - + return count; } @@ -644,5 +644,5 @@ size_t size = loc_count_namespaces_internal(exch); loc_exchange_end(exch); - + return size; } @@ -653,5 +653,5 @@ size_t size = loc_count_services_internal(exch, ns_handle); loc_exchange_end(exch); - + return size; } @@ -664,20 +664,20 @@ size_t count = loc_count_namespaces_internal(exch); loc_exchange_end(exch); - + if (count == 0) return 0; - + loc_sdesc_t *devs = (loc_sdesc_t *) calloc(count, sizeof(loc_sdesc_t)); if (devs == NULL) return 0; - + exch = loc_exchange_begin(INTERFACE_LOC_CONSUMER); - + ipc_call_t answer; aid_t req = async_send_0(exch, LOC_GET_NAMESPACES, &answer); errno_t rc = async_data_read_start(exch, devs, count * sizeof(loc_sdesc_t)); - + loc_exchange_end(exch); - + if (rc == EOVERFLOW) { /* @@ -688,5 +688,5 @@ continue; } - + if (rc != EOK) { async_forget(req); @@ -694,11 +694,11 @@ return 0; } - + errno_t retval; async_wait_for(req, &retval); - + if (retval != EOK) return 0; - + *data = devs; return count; @@ -713,20 +713,20 @@ size_t count = loc_count_services_internal(exch, ns_handle); loc_exchange_end(exch); - + if (count == 0) return 0; - + loc_sdesc_t *devs = (loc_sdesc_t *) calloc(count, sizeof(loc_sdesc_t)); if (devs == NULL) return 0; - + exch = loc_exchange_begin(INTERFACE_LOC_CONSUMER); - + ipc_call_t answer; aid_t req = async_send_1(exch, LOC_GET_SERVICES, ns_handle, &answer); errno_t rc = async_data_read_start(exch, devs, count * sizeof(loc_sdesc_t)); - + loc_exchange_end(exch); - + if (rc == EOVERFLOW) { /* @@ -737,5 +737,5 @@ continue; } - + if (rc != EOK) { async_forget(req); @@ -743,11 +743,11 @@ return 0; } - + errno_t retval; async_wait_for(req, &retval); - + if (retval != EOK) return 0; - + *data = devs; return count; @@ -763,19 +763,19 @@ aid_t req = async_send_1(exch, method, arg1, &answer); errno_t rc = async_data_read_start(exch, id_buf, buf_size); - - loc_exchange_end(exch); - + + loc_exchange_end(exch); + if (rc != EOK) { async_forget(req); return rc; } - + errno_t retval; async_wait_for(req, &retval); - - if (retval != EOK) { - return retval; - } - + + if (retval != EOK) { + return retval; + } + *act_size = IPC_GET_ARG1(answer); return EOK; @@ -797,5 +797,5 @@ *data = NULL; *count = 0; - + size_t act_size = 0; errno_t rc = loc_category_get_ids_once(method, arg1, NULL, 0, @@ -803,10 +803,10 @@ if (rc != EOK) return rc; - + size_t alloc_size = act_size; service_id_t *ids = malloc(alloc_size); if (ids == NULL) return ENOMEM; - + while (true) { rc = loc_category_get_ids_once(method, arg1, ids, alloc_size, @@ -814,8 +814,8 @@ if (rc != EOK) return rc; - + if (act_size <= alloc_size) break; - + alloc_size = act_size; ids = realloc(ids, alloc_size); @@ -823,5 +823,5 @@ return ENOMEM; } - + *count = act_size / sizeof(category_id_t); *data = ids; @@ -866,8 +866,8 @@ return EIO; } - + cat_change_cb = cb_fun; fibril_mutex_unlock(&loc_callback_mutex); - + return EOK; } Index: uspace/lib/c/generic/malloc.c =================================================================== --- uspace/lib/c/generic/malloc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/malloc.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -142,14 +142,14 @@ */ void *start; - + /** End of the heap area (aligned on page boundary) */ void *end; - + /** Previous heap area */ struct heap_area *prev; - + /** Next heap area */ struct heap_area *next; - + /** A magic value */ uint32_t magic; @@ -162,11 +162,11 @@ /* Size of the block (including header and footer) */ size_t size; - + /* Indication of a free block */ bool free; - + /** Heap area this block belongs to */ heap_area_t *area; - + /* A magic value to detect overwrite of heap header */ uint32_t magic; @@ -179,5 +179,5 @@ /* Size of the block (including header and footer) */ size_t size; - + /* A magic value to detect overwrite of heap footer */ uint32_t magic; @@ -277,12 +277,12 @@ /* Calculate the position of the header and the footer */ heap_block_head_t *head = (heap_block_head_t *) addr; - + head->size = size; head->free = free; head->area = area; head->magic = HEAP_BLOCK_HEAD_MAGIC; - + heap_block_foot_t *foot = BLOCK_FOOT(head); - + foot->size = size; foot->magic = HEAP_BLOCK_FOOT_MAGIC; @@ -301,9 +301,9 @@ { heap_block_head_t *head = (heap_block_head_t *) addr; - + malloc_assert(head->magic == HEAP_BLOCK_HEAD_MAGIC); - + heap_block_foot_t *foot = BLOCK_FOOT(head); - + malloc_assert(foot->magic == HEAP_BLOCK_FOOT_MAGIC); malloc_assert(head->size == foot->size); @@ -320,5 +320,5 @@ { heap_area_t *area = (heap_area_t *) addr; - + malloc_assert(area->magic == HEAP_AREA_MAGIC); malloc_assert(addr == area->start); @@ -343,7 +343,7 @@ if (astart == AS_MAP_FAILED) return false; - + heap_area_t *area = (heap_area_t *) astart; - + area->start = astart; area->end = (void *) ((uintptr_t) astart + asize); @@ -351,10 +351,10 @@ area->next = NULL; area->magic = HEAP_AREA_MAGIC; - + void *block = (void *) AREA_FIRST_BLOCK_HEAD(area); size_t bsize = (size_t) (area->end - block); - + block_init(block, bsize, true, area); - + if (last_heap_area == NULL) { first_heap_area = area; @@ -365,5 +365,5 @@ last_heap_area = area; } - + return true; } @@ -383,24 +383,24 @@ if (size == 0) return true; - + area_check(area); - + /* New heap area size */ size_t gross_size = (size_t) (area->end - area->start) + size; size_t asize = ALIGN_UP(gross_size, PAGE_SIZE); void *end = (void *) ((uintptr_t) area->start + asize); - + /* Check for overflow */ if (end < area->start) return false; - + /* Resize the address space area */ errno_t ret = as_area_resize(area->start, asize, 0); if (ret != EOK) return false; - + heap_block_head_t *last_head = (heap_block_head_t *) AREA_LAST_BLOCK_HEAD(area); - + if (last_head->free) { /* Add the new space to the last block. */ @@ -414,8 +414,8 @@ block_init(area->end, net_size, true, area); } - + /* Update heap area parameters */ area->end = end; - + return true; } @@ -432,12 +432,12 @@ { area_check(area); - + heap_block_foot_t *last_foot = (heap_block_foot_t *) AREA_LAST_BLOCK_FOOT(area); heap_block_head_t *last_head = BLOCK_HEAD(last_foot); - + block_check((void *) last_head); malloc_assert(last_head->area == area); - + if (last_head->free) { /* @@ -446,13 +446,13 @@ * shrunk. */ - + heap_block_head_t *first_head = (heap_block_head_t *) AREA_FIRST_BLOCK_HEAD(area); - + block_check((void *) first_head); malloc_assert(first_head->area == area); - + size_t shrink_size = ALIGN_DOWN(last_head->size, PAGE_SIZE); - + if (first_head == last_head) { /* @@ -461,8 +461,8 @@ * of it entirely. */ - + heap_area_t *prev = area->prev; heap_area_t *next = area->next; - + if (prev != NULL) { area_check(prev); @@ -470,5 +470,5 @@ } else first_heap_area = next; - + if (next != NULL) { area_check(next); @@ -476,5 +476,5 @@ } else last_heap_area = prev; - + as_area_destroy(area->start); } else if (shrink_size >= SHRINK_GRANULARITY) { @@ -484,17 +484,17 @@ * the block layout accordingly. */ - + size_t asize = (size_t) (area->end - area->start) - shrink_size; void *end = (void *) ((uintptr_t) area->start + asize); - + /* Resize the address space area */ errno_t ret = as_area_resize(area->start, asize, 0); if (ret != EOK) abort(); - + /* Update heap area parameters */ area->end = end; size_t excess = ((size_t) area->end) - ((size_t) last_head); - + if (excess > 0) { if (excess >= STRUCT_OVERHEAD) { @@ -513,7 +513,7 @@ (((uintptr_t) last_head) - sizeof(heap_block_foot_t)); heap_block_head_t *prev_head = BLOCK_HEAD(prev_foot); - + block_check((void *) prev_head); - + block_init(prev_head, prev_head->size + excess, prev_head->free, area); @@ -522,5 +522,5 @@ } } - + next_fit = NULL; } @@ -551,8 +551,8 @@ { malloc_assert(cur->size >= size); - + /* See if we should split the block. */ size_t split_limit = GROSS_SIZE(size); - + if (cur->size > split_limit) { /* Block big enough -> split. */ @@ -588,13 +588,13 @@ malloc_assert((void *) first_block >= (void *) AREA_FIRST_BLOCK_HEAD(area)); malloc_assert((void *) first_block < area->end); - + for (heap_block_head_t *cur = first_block; (void *) cur < area->end; cur = (heap_block_head_t *) (((void *) cur) + cur->size)) { block_check(cur); - + /* Finish searching on the final block */ if ((final_block != NULL) && (cur == final_block)) break; - + /* Try to find a block that is free and large enough. */ if ((cur->free) && (cur->size >= real_size)) { @@ -607,9 +607,9 @@ void *aligned = (void *) ALIGN_UP((uintptr_t) addr, falign); - + if (addr == aligned) { /* Exact block start including alignment. */ split_mark(cur, real_size); - + next_fit = cur; return addr; @@ -617,5 +617,5 @@ /* Block start has to be aligned */ size_t excess = (size_t) (aligned - addr); - + if (cur->size >= real_size + excess) { /* @@ -631,13 +631,13 @@ heap_block_foot_t *prev_foot = (heap_block_foot_t *) ((void *) cur - sizeof(heap_block_foot_t)); - + heap_block_head_t *prev_head = (heap_block_head_t *) ((void *) cur - prev_foot->size); - + block_check(prev_head); - + size_t reduced_size = cur->size - excess; heap_block_head_t *next_head = ((void *) cur) + excess; - + if ((!prev_head->free) && (excess >= STRUCT_OVERHEAD)) { @@ -660,8 +660,8 @@ prev_head->free, area); } - + block_init(next_head, reduced_size, true, area); split_mark(next_head, real_size); - + next_fit = next_head; return aligned; @@ -678,5 +678,5 @@ excess += falign; } - + /* Check for current block size again */ if (cur->size >= real_size + excess) { @@ -684,10 +684,10 @@ cur = (heap_block_head_t *) (AREA_FIRST_BLOCK_HEAD(area) + excess); - + block_init((void *) AREA_FIRST_BLOCK_HEAD(area), excess, true, area); block_init(cur, reduced_size, true, area); split_mark(cur, real_size); - + next_fit = cur; return aligned; @@ -698,5 +698,5 @@ } } - + return NULL; } @@ -718,13 +718,13 @@ if (size == 0) return NULL; - + /* First try to enlarge some existing area */ for (heap_area_t *area = first_heap_area; area != NULL; area = area->next) { - + if (area_grow(area, size + align)) { heap_block_head_t *first = (heap_block_head_t *) AREA_LAST_BLOCK_HEAD(area); - + void *addr = malloc_area(area, first, NULL, size, align); @@ -733,10 +733,10 @@ } } - + /* Eventually try to create a new area */ if (area_create(AREA_OVERHEAD(size + align))) { heap_block_head_t *first = (heap_block_head_t *) AREA_FIRST_BLOCK_HEAD(last_heap_area); - + void *addr = malloc_area(last_heap_area, first, NULL, size, align); @@ -744,5 +744,5 @@ return addr; } - + return NULL; } @@ -761,14 +761,14 @@ { malloc_assert(first_heap_area != NULL); - + if (align == 0) return NULL; - + size_t falign = lcm(align, BASE_ALIGN); - + /* Check for integer overflow. */ if (falign < align) return NULL; - + /* * The size of the allocated block needs to be naturally @@ -778,16 +778,16 @@ */ size_t gross_size = GROSS_SIZE(ALIGN_UP(size, BASE_ALIGN)); - + /* Try the next fit approach */ heap_block_head_t *split = next_fit; - + if (split != NULL) { void *addr = malloc_area(split->area, split, NULL, gross_size, falign); - + if (addr != NULL) return addr; } - + /* Search the entire heap */ for (heap_area_t *area = first_heap_area; area != NULL; @@ -795,12 +795,12 @@ heap_block_head_t *first = (heap_block_head_t *) AREA_FIRST_BLOCK_HEAD(area); - + void *addr = malloc_area(area, first, split, gross_size, falign); - + if (addr != NULL) return addr; } - + /* Finally, try to grow heap space and allocate in the new area. */ return heap_grow_and_alloc(gross_size, falign); @@ -818,9 +818,9 @@ { // FIXME: Check for overflow - + void *block = malloc(nmemb * size); if (block == NULL) return NULL; - + memset(block, 0, nmemb * size); return block; @@ -855,5 +855,5 @@ if (align == 0) return NULL; - + size_t palign = 1 << (fnzb(max(sizeof(void *), align) - 1) + 1); @@ -883,25 +883,25 @@ if (addr == NULL) return malloc(size); - + heap_lock(); - + /* Calculate the position of the header. */ heap_block_head_t *head = (heap_block_head_t *) (addr - sizeof(heap_block_head_t)); - + block_check(head); malloc_assert(!head->free); - + heap_area_t *area = head->area; - + area_check(area); malloc_assert((void *) head >= (void *) AREA_FIRST_BLOCK_HEAD(area)); malloc_assert((void *) head < area->end); - + void *ptr = NULL; bool reloc = false; size_t real_size = GROSS_SIZE(ALIGN_UP(size, BASE_ALIGN)); size_t orig_size = head->size; - + if (orig_size > real_size) { /* Shrink */ @@ -916,5 +916,5 @@ heap_shrink(area); } - + ptr = ((void *) head) + sizeof(heap_block_head_t); } else { @@ -948,5 +948,5 @@ } } - + /* * Look at the next block. If it is free and the size is @@ -962,5 +962,5 @@ area); split_mark(head, real_size); - + ptr = ((void *) head) + sizeof(heap_block_head_t); next_fit = NULL; @@ -969,7 +969,7 @@ } } - + heap_unlock(); - + if (reloc) { ptr = malloc(size); @@ -979,5 +979,5 @@ } } - + return ptr; } @@ -992,27 +992,27 @@ if (addr == NULL) return; - + heap_lock(); - + /* Calculate the position of the header. */ heap_block_head_t *head = (heap_block_head_t *) (addr - sizeof(heap_block_head_t)); - + block_check(head); malloc_assert(!head->free); - + heap_area_t *area = head->area; - + area_check(area); malloc_assert((void *) head >= (void *) AREA_FIRST_BLOCK_HEAD(area)); malloc_assert((void *) head < area->end); - + /* Mark the block itself as free. */ head->free = true; - + /* Look at the next block. If it is free, merge the two. */ heap_block_head_t *next_head = (heap_block_head_t *) (((void *) head) + head->size); - + if ((void *) next_head < area->end) { block_check(next_head); @@ -1020,22 +1020,22 @@ block_init(head, head->size + next_head->size, true, area); } - + /* Look at the previous block. If it is free, merge the two. */ if ((void *) head > (void *) AREA_FIRST_BLOCK_HEAD(area)) { heap_block_foot_t *prev_foot = (heap_block_foot_t *) (((void *) head) - sizeof(heap_block_foot_t)); - + heap_block_head_t *prev_head = (heap_block_head_t *) (((void *) head) - prev_foot->size); - + block_check(prev_head); - + if (prev_head->free) block_init(prev_head, prev_head->size + head->size, true, area); } - + heap_shrink(area); - + heap_unlock(); } @@ -1044,14 +1044,14 @@ { heap_lock(); - + if (first_heap_area == NULL) { heap_unlock(); return (void *) -1; } - + /* Walk all heap areas */ for (heap_area_t *area = first_heap_area; area != NULL; area = area->next) { - + /* Check heap area consistency */ if ((area->magic != HEAP_AREA_MAGIC) || @@ -1063,10 +1063,10 @@ return (void *) area; } - + /* Walk all heap blocks */ for (heap_block_head_t *head = (heap_block_head_t *) AREA_FIRST_BLOCK_HEAD(area); (void *) head < area->end; head = (heap_block_head_t *) (((void *) head) + head->size)) { - + /* Check heap block consistency */ if (head->magic != HEAP_BLOCK_HEAD_MAGIC) { @@ -1074,7 +1074,7 @@ return (void *) head; } - + heap_block_foot_t *foot = BLOCK_FOOT(head); - + if ((foot->magic != HEAP_BLOCK_FOOT_MAGIC) || (head->size != foot->size)) { @@ -1084,7 +1084,7 @@ } } - + heap_unlock(); - + return NULL; } Index: uspace/lib/c/generic/mem.c =================================================================== --- uspace/lib/c/generic/mem.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/mem.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -103,9 +103,9 @@ for (i = 0; i < n / sizeof(unsigned long); i++) adst[i].n = asrc[i].n; - + for (j = 0; j < n % sizeof(unsigned long); j++) ((unsigned char *) (((unsigned long *) dst) + i))[j] = ((unsigned char *) (((unsigned long *) src) + i))[j]; - + return (char *) dst; } Index: uspace/lib/c/generic/ns.c =================================================================== --- uspace/lib/c/generic/ns.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/ns.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -50,20 +50,20 @@ errno_t retval; ipc_call_t answer; - + async_sess_t *sess = ns_session_get(); if (sess == NULL) return EIO; - + async_exch_t *exch = async_exchange_begin(sess); aid_t req = async_send_1(exch, NS_REGISTER, service, &answer); errno_t rc = async_connect_to_me(exch, 0, service, 0); - + async_exchange_end(exch); - + if (rc != EOK) { async_forget(req); return rc; } - + async_wait_for(req, &retval); return rc; @@ -75,16 +75,16 @@ if (sess == NULL) return NULL; - + async_exch_t *exch = async_exchange_begin(sess); if (exch == NULL) return NULL; - + async_sess_t *csess = async_connect_me_to_iface(exch, iface, service, arg3); async_exchange_end(exch); - + if (csess == NULL) return NULL; - + /* * FIXME Ugly hack to work around limitation of implementing @@ -93,5 +93,5 @@ */ async_sess_args_set(csess, iface, arg3, 0); - + return csess; } @@ -103,13 +103,13 @@ if (sess == NULL) return NULL; - + async_exch_t *exch = async_exchange_begin(sess); async_sess_t *csess = async_connect_me_to_blocking_iface(exch, iface, service, arg3); async_exchange_end(exch); - + if (csess == NULL) return NULL; - + /* * FIXME Ugly hack to work around limitation of implementing @@ -118,5 +118,5 @@ */ async_sess_args_set(csess, iface, arg3, 0); - + return csess; } @@ -128,9 +128,9 @@ if (sess == NULL) return EIO; - + async_exch_t *exch = async_exchange_begin(sess); errno_t rc = async_req_0_0(exch, NS_PING); async_exchange_end(exch); - + return rc; } @@ -142,9 +142,9 @@ if (sess == NULL) return EIO; - + exch = async_exchange_begin(sess); errno_t rc = async_req_2_0(exch, NS_ID_INTRO, LOWER32(id), UPPER32(id)); async_exchange_end(exch); - + return rc; } @@ -153,5 +153,5 @@ { async_exch_t *exch; - + if (sess_ns == NULL) { exch = async_exchange_begin(session_ns); @@ -161,5 +161,5 @@ return NULL; } - + return sess_ns; } Index: uspace/lib/c/generic/perm.c =================================================================== --- uspace/lib/c/generic/perm.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/perm.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -54,5 +54,5 @@ return (errno_t) __SYSCALL2(SYS_PERM_GRANT, (sysarg_t) &arg, (sysarg_t) perms); #endif - + #ifdef __64_BITS__ return (errno_t) __SYSCALL2(SYS_PERM_GRANT, (sysarg_t) id, (sysarg_t) perms); @@ -74,5 +74,5 @@ return (errno_t) __SYSCALL2(SYS_PERM_REVOKE, (sysarg_t) &arg, (sysarg_t) perms); #endif - + #ifdef __64_BITS__ return (errno_t) __SYSCALL2(SYS_PERM_REVOKE, (sysarg_t) id, (sysarg_t) perms); Index: uspace/lib/c/generic/private/async.h =================================================================== --- uspace/lib/c/generic/private/async.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/private/async.h (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -47,11 +47,11 @@ /** If true, this struct is in the timeout list. */ bool inlist; - + /** Timeout list link. */ link_t link; - + /** If true, we have timed out. */ bool occurred; - + /** Expiration time. */ struct timeval expires; @@ -62,5 +62,5 @@ /** If true, this struct is in a synchronization object wait queue. */ bool inlist; - + /** Wait queue linkage. */ link_t link; @@ -71,8 +71,8 @@ /** Identification of and link to the waiting fibril. */ fid_t fid; - + /** If true, this fibril is currently active. */ bool active; - + /** Timeout wait data. */ to_event_t to_event; Index: uspace/lib/c/generic/private/stdio.h =================================================================== --- uspace/lib/c/generic/private/stdio.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/private/stdio.h (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -46,5 +46,5 @@ /** Linked list pointer. */ link_t link; - + /** Underlying file descriptor. */ int fd; @@ -52,17 +52,17 @@ /** File position. */ aoff64_t pos; - + /** Error indicator. */ int error; - + /** End-of-file indicator. */ int eof; - + /** KIO indicator */ int kio; - + /** Session to the file provider */ async_sess_t *sess; - + /** * Non-zero if the stream needs sync on fflush(). XXX change @@ -70,20 +70,20 @@ */ int need_sync; - + /** Buffering type */ enum _buffer_type btype; - + /** Buffer */ uint8_t *buf; - + /** Buffer size */ size_t buf_size; - + /** Buffer state */ enum _buffer_state buf_state; - + /** Buffer I/O pointer */ uint8_t *buf_head; - + /** Points to end of occupied space when in read mode. */ uint8_t *buf_tail; Index: uspace/lib/c/generic/rcu.c =================================================================== --- uspace/lib/c/generic/rcu.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/rcu.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -169,9 +169,9 @@ { assert(!fibril_rcu.registered); - + futex_down(&rcu.list_futex); list_append(&fibril_rcu.link, &rcu.fibrils_list); futex_up(&rcu.list_futex); - + fibril_rcu.registered = true; } @@ -185,5 +185,5 @@ { assert(fibril_rcu.registered); - + /* * Forcefully unlock any reader sections. The fibril is exiting @@ -194,5 +194,5 @@ memory_barrier(); fibril_rcu.nesting_cnt = 0; - + futex_down(&rcu.list_futex); list_remove(&fibril_rcu.link); @@ -209,7 +209,7 @@ { assert(fibril_rcu.registered); - + size_t nesting_cnt = ACCESS_ONCE(fibril_rcu.nesting_cnt); - + if (0 == (nesting_cnt >> RCU_NESTING_SHIFT)) { ACCESS_ONCE(fibril_rcu.nesting_cnt) = ACCESS_ONCE(rcu.reader_group); @@ -226,5 +226,5 @@ assert(fibril_rcu.registered); assert(rcu_read_locked()); - + /* Required by MB_FORCE_U */ compiler_barrier(); /* CC_BAR_U */ @@ -243,5 +243,5 @@ { assert(!rcu_read_locked()); - + /* Contain load of rcu.cur_gp. */ memory_barrier(); @@ -249,7 +249,7 @@ /* Approximately the number of the GP in progress. */ size_t gp_in_progress = ACCESS_ONCE(rcu.cur_gp); - + lock_sync(blocking_mode); - + /* * Exit early if we were stuck waiting for the mutex for a full grace @@ -264,7 +264,7 @@ return; } - + ++ACCESS_ONCE(rcu.cur_gp); - + /* * Pairs up with MB_FORCE_L (ie CC_BAR_L). Makes changes prior @@ -272,5 +272,5 @@ */ memory_barrier(); /* MB_A */ - + /* * Pairs up with MB_A. @@ -290,5 +290,5 @@ */ force_mb_in_all_threads(); /* MB_FORCE_L */ - + /* * Pairs with MB_FORCE_L (ie CC_BAR_L, CC_BAR_U) and makes the most @@ -296,11 +296,11 @@ */ read_barrier(); /* MB_B */ - + size_t new_reader_group = get_other_group(rcu.reader_group); wait_for_readers(new_reader_group, blocking_mode); - + /* Separates waiting for readers in new_reader_group from group flip. */ memory_barrier(); - + /* Flip the group new readers should associate with. */ size_t old_reader_group = rcu.reader_group; @@ -309,10 +309,10 @@ /* Flip the group before waiting for preexisting readers in the old group.*/ memory_barrier(); - + wait_for_readers(old_reader_group, blocking_mode); - + /* MB_FORCE_U */ force_mb_in_all_threads(); /* MB_FORCE_U */ - + unlock_sync(); } @@ -333,13 +333,13 @@ { futex_down(&rcu.list_futex); - + list_t quiescent_fibrils; list_initialize(&quiescent_fibrils); - + while (!list_empty(&rcu.fibrils_list)) { list_foreach_safe(rcu.fibrils_list, fibril_it, next_fibril) { fibril_rcu_data_t *fib = member_to_inst(fibril_it, fibril_rcu_data_t, link); - + if (is_preexisting_reader(fib, reader_group)) { futex_up(&rcu.list_futex); @@ -354,5 +354,5 @@ } } - + list_concat(&rcu.fibrils_list, &quiescent_fibrils); futex_up(&rcu.list_futex); @@ -366,7 +366,7 @@ blocked_fibril_t blocked_fib; blocked_fib.id = fibril_get_id(); - + list_append(&blocked_fib.link, &rcu.sync_lock.blocked_fibrils); - + do { blocked_fib.is_ready = false; @@ -375,5 +375,5 @@ futex_down(&rcu.sync_lock.futex); } while (rcu.sync_lock.locked); - + list_remove(&blocked_fib.link); rcu.sync_lock.locked = true; @@ -392,5 +392,5 @@ { assert(rcu.sync_lock.locked); - + /* * Blocked threads have a priority over fibrils when accessing sync(). @@ -402,9 +402,9 @@ } else { /* Unlock but wake up any fibrils waiting for the lock. */ - + if (!list_empty(&rcu.sync_lock.blocked_fibrils)) { blocked_fibril_t *blocked_fib = member_to_inst( list_first(&rcu.sync_lock.blocked_fibrils), blocked_fibril_t, link); - + if (!blocked_fib->is_ready) { blocked_fib->is_ready = true; @@ -412,5 +412,5 @@ } } - + rcu.sync_lock.locked = false; futex_up(&rcu.sync_lock.futex); @@ -432,5 +432,5 @@ thread_usleep(RCU_SLEEP_MS * 1000); } - + futex_down(&rcu.sync_lock.futex); } @@ -440,5 +440,5 @@ { size_t nesting_cnt = ACCESS_ONCE(fib->nesting_cnt); - + return is_in_group(nesting_cnt, group) && is_in_reader_section(nesting_cnt); } Index: uspace/lib/c/generic/rtld/module.c =================================================================== --- uspace/lib/c/generic/rtld/module.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/rtld/module.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -150,5 +150,5 @@ } } - + return NULL; /* Not found */ } @@ -166,5 +166,5 @@ module_t *m; int rc; - + m = calloc(1, sizeof(module_t)); if (m == NULL) { @@ -172,5 +172,5 @@ exit(1); } - + m->rtld = rtld; m->id = rtld_get_next_id(rtld); @@ -216,5 +216,5 @@ /* Insert into the list of loaded modules */ list_append(&m->modules_link, &rtld->modules); - + /* Copy TLS info */ m->tdata = info.tls.tdata; @@ -222,5 +222,5 @@ m->tbss_size = info.tls.tbss_size; m->tls_align = info.tls.tls_align; - + DPRINTF("tdata at %p size %zu, tbss size %zu\n", m->tdata, m->tdata_size, m->tbss_size); @@ -241,5 +241,5 @@ /* Count direct dependencies */ - + dp = m->dyn.dynamic; n = 0; Index: uspace/lib/c/generic/stacktrace.c =================================================================== --- uspace/lib/c/generic/stacktrace.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/stacktrace.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -77,10 +77,10 @@ stacktrace_prepare(); stacktrace_print_fp_pc(stacktrace_fp_get(), stacktrace_pc_get()); - + /* * Prevent the tail call optimization of the previous call by * making it a non-tail call. */ - + printf("-- end of stack trace --\n"); } Index: uspace/lib/c/generic/stats.c =================================================================== --- uspace/lib/c/generic/stats.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/stats.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -70,5 +70,5 @@ stats_cpu_t *stats_cpus = (stats_cpu_t *) sysinfo_get_data("system.cpus", &size); - + if ((size % sizeof(stats_cpu_t)) != 0) { if (stats_cpus != NULL) @@ -77,5 +77,5 @@ return NULL; } - + *count = size / sizeof(stats_cpu_t); return stats_cpus; @@ -95,5 +95,5 @@ stats_physmem_t *stats_physmem = (stats_physmem_t *) sysinfo_get_data("system.physmem", &size); - + if (size != sizeof(stats_physmem_t)) { if (stats_physmem != NULL) @@ -101,5 +101,5 @@ return NULL; } - + return stats_physmem; } @@ -119,5 +119,5 @@ stats_task_t *stats_tasks = (stats_task_t *) sysinfo_get_data("system.tasks", &size); - + if ((size % sizeof(stats_task_t)) != 0) { if (stats_tasks != NULL) @@ -126,5 +126,5 @@ return NULL; } - + *count = size / sizeof(stats_task_t); return stats_tasks; @@ -144,9 +144,9 @@ char name[SYSINFO_STATS_MAX_PATH]; snprintf(name, SYSINFO_STATS_MAX_PATH, "system.tasks.%" PRIu64, task_id); - + size_t size = 0; stats_task_t *stats_task = (stats_task_t *) sysinfo_get_data(name, &size); - + if (size != sizeof(stats_task_t)) { if (stats_task != NULL) @@ -154,5 +154,5 @@ return NULL; } - + return stats_task; } @@ -172,5 +172,5 @@ stats_thread_t *stats_threads = (stats_thread_t *) sysinfo_get_data("system.threads", &size); - + if ((size % sizeof(stats_thread_t)) != 0) { if (stats_threads != NULL) @@ -179,5 +179,5 @@ return NULL; } - + *count = size / sizeof(stats_thread_t); return stats_threads; @@ -197,9 +197,9 @@ char name[SYSINFO_STATS_MAX_PATH]; snprintf(name, SYSINFO_STATS_MAX_PATH, "system.threads.%" PRIu64, thread_id); - + size_t size = 0; stats_thread_t *stats_thread = (stats_thread_t *) sysinfo_get_data(name, &size); - + if (size != sizeof(stats_thread_t)) { if (stats_thread != NULL) @@ -207,5 +207,5 @@ return NULL; } - + return stats_thread; } @@ -225,5 +225,5 @@ stats_exc_t *stats_exceptions = (stats_exc_t *) sysinfo_get_data("system.exceptions", &size); - + if ((size % sizeof(stats_exc_t)) != 0) { if (stats_exceptions != NULL) @@ -232,5 +232,5 @@ return NULL; } - + *count = size / sizeof(stats_exc_t); return stats_exceptions; @@ -250,9 +250,9 @@ char name[SYSINFO_STATS_MAX_PATH]; snprintf(name, SYSINFO_STATS_MAX_PATH, "system.exceptions.%u", excn); - + size_t size = 0; stats_exc_t *stats_exception = (stats_exc_t *) sysinfo_get_data(name, &size); - + if (size != sizeof(stats_exc_t)) { if (stats_exception != NULL) @@ -260,5 +260,5 @@ return NULL; } - + return stats_exception; } @@ -278,5 +278,5 @@ load_t *load = (load_t *) sysinfo_get_data("system.load", &size); - + if ((size % sizeof(load_t)) != 0) { if (load != NULL) @@ -285,5 +285,5 @@ return NULL; } - + *count = size / sizeof(load_t); return load; @@ -303,7 +303,7 @@ /* Print the whole part */ printf("%u.", upper / LOAD_UNIT); - + load_t rest = (upper % LOAD_UNIT) * 10; - + unsigned int i; for (i = 0; i < dec_length; i++) { @@ -317,5 +317,5 @@ if (state <= Lingering) return thread_states[state]; - + return thread_states[Invalid]; } Index: uspace/lib/c/generic/str.c =================================================================== --- uspace/lib/c/generic/str.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/str.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -85,13 +85,13 @@ if (*offset + 1 > size) return 0; - + /* First byte read from string */ uint8_t b0 = (uint8_t) str[(*offset)++]; - + /* Determine code length */ - + unsigned int b0_bits; /* Data bits in first byte */ unsigned int cbytes; /* Number of continuation bytes */ - + if ((b0 & 0x80) == 0) { /* 0xxxxxxx (Plain ASCII) */ @@ -114,23 +114,23 @@ return U_SPECIAL; } - + if (*offset + cbytes > size) return U_SPECIAL; - + wchar_t ch = b0 & LO_MASK_8(b0_bits); - + /* Decode continuation bytes */ while (cbytes > 0) { uint8_t b = (uint8_t) str[(*offset)++]; - + /* Must be 10xxxxxx */ if ((b & 0xc0) != 0x80) return U_SPECIAL; - + /* Shift data bits to ch */ ch = (ch << CONT_BITS) | (wchar_t) (b & LO_MASK_8(CONT_BITS)); cbytes--; } - + return ch; } @@ -155,10 +155,10 @@ if (*offset == 0) return 0; - + size_t processed = 0; /* Continue while continuation bytes found */ while (*offset > 0 && processed < 4) { uint8_t b = (uint8_t) str[--(*offset)]; - + if (processed == 0 && (b & 0x80) == 0) { /* 0xxxxxxx (Plain ASCII) */ @@ -200,17 +200,17 @@ if (*offset >= size) return EOVERFLOW; - + if (!chr_check(ch)) return EINVAL; - + /* Unsigned version of ch (bit operations should only be done on unsigned types). */ uint32_t cc = (uint32_t) ch; - + /* Determine how many continuation bytes are needed */ - + unsigned int b0_bits; /* Data bits in first byte */ unsigned int cbytes; /* Number of continuation bytes */ - + if ((cc & ~LO_MASK_32(7)) == 0) { b0_bits = 7; @@ -229,9 +229,9 @@ return EINVAL; } - + /* Check for available space in buffer */ if (*offset + cbytes >= size) return EOVERFLOW; - + /* Encode continuation bytes */ unsigned int i; @@ -240,11 +240,11 @@ cc = cc >> CONT_BITS; } - + /* Encode first byte */ str[*offset] = (cc & LO_MASK_32(b0_bits)) | HI_MASK_8(8 - b0_bits - 1); - + /* Advance offset */ *offset += cbytes + 1; - + return EOK; } @@ -263,8 +263,8 @@ { size_t size = 0; - + while (*str++ != 0) size++; - + return size; } @@ -302,12 +302,12 @@ size_t len = 0; size_t offset = 0; - + while (len < max_len) { if (str_decode(str, &offset, STR_NO_LIMIT) == 0) break; - + len++; } - + return offset; } @@ -327,8 +327,8 @@ { size_t size = 0; - + while ((*str++ != 0) && (size < max_size)) size++; - + return size; } @@ -379,8 +379,8 @@ size_t len = 0; size_t offset = 0; - + while (str_decode(str, &offset, STR_NO_LIMIT) != 0) len++; - + return len; } @@ -396,8 +396,8 @@ { size_t len = 0; - + while (*wstr++ != 0) len++; - + return len; } @@ -415,8 +415,8 @@ size_t len = 0; size_t offset = 0; - + while (str_decode(str, &offset, size) != 0) len++; - + return len; } @@ -435,10 +435,10 @@ size_t limit = ALIGN_DOWN(size, sizeof(wchar_t)); size_t offset = 0; - + while ((offset < limit) && (*str++ != 0)) { len++; offset += sizeof(wchar_t); } - + return len; } @@ -464,8 +464,8 @@ size_t offset = 0; wchar_t ch; - + while ((ch = str_decode(str, &offset, STR_NO_LIMIT)) != 0) width += chr_width(ch); - + return width; } @@ -480,5 +480,5 @@ if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127)) return true; - + return false; } @@ -493,5 +493,5 @@ if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111)) return true; - + return false; } @@ -666,8 +666,8 @@ wchar_t c1 = 0; wchar_t c2 = 0; - + size_t off1 = 0; size_t off2 = 0; - + size_t len = 0; @@ -710,5 +710,5 @@ wchar_t c1 = 0; wchar_t c2 = 0; - + size_t off1 = 0; size_t off2 = 0; @@ -717,5 +717,5 @@ c1 = str_decode(s, &off1, STR_NO_LIMIT); c2 = str_decode(p, &off2, STR_NO_LIMIT); - + if (c2 == 0) return true; @@ -723,5 +723,5 @@ if (c1 != c2) return false; - + if (c1 == 0) break; @@ -747,8 +747,8 @@ /* There must be space for a null terminator in the buffer. */ assert(size > 0); - + size_t src_off = 0; size_t dest_off = 0; - + wchar_t ch; while ((ch = str_decode(src, &src_off, STR_NO_LIMIT)) != 0) { @@ -756,5 +756,5 @@ break; } - + dest[dest_off] = '\0'; } @@ -780,8 +780,8 @@ /* There must be space for a null terminator in the buffer. */ assert(size > 0); - + size_t src_off = 0; size_t dest_off = 0; - + wchar_t ch; while ((ch = str_decode(src, &src_off, n)) != 0) { @@ -789,5 +789,5 @@ break; } - + dest[dest_off] = '\0'; } @@ -811,5 +811,5 @@ if (dstr_size >= size) return; - + str_cpy(dest + dstr_size, size - dstr_size, src); } @@ -896,5 +896,5 @@ /* There must be space for a null terminator in the buffer. */ assert(size > 0); - + src_idx = 0; dest_off = 0; @@ -971,5 +971,5 @@ assert(dlen > 0); - + while ((c = str_decode(src, &offset, STR_NO_LIMIT)) != 0) { if (c > 0x10000) { @@ -1109,9 +1109,9 @@ { size_t len = str_length(str); - + wchar_t *wstr = calloc(len+1, sizeof(wchar_t)); if (wstr == NULL) return NULL; - + str_to_wstr(wstr, len + 1, str); return wstr; @@ -1130,5 +1130,5 @@ size_t off = 0; size_t last = 0; - + while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) { if (acc == ch) @@ -1136,5 +1136,5 @@ last = off; } - + return NULL; } @@ -1207,5 +1207,5 @@ size_t last = 0; const char *res = NULL; - + while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) { if (acc == ch) @@ -1213,5 +1213,5 @@ last = off; } - + return (char *) res; } @@ -1234,14 +1234,14 @@ { size_t len = wstr_length(str); - + if ((pos > len) || (pos + 1 > max_pos)) return false; - + size_t i; for (i = len; i + 1 > pos; i--) str[i + 1] = str[i]; - + str[pos] = ch; - + return true; } @@ -1262,12 +1262,12 @@ { size_t len = wstr_length(str); - + if (pos >= len) return false; - + size_t i; for (i = pos + 1; i <= len; i++) str[i - 1] = str[i]; - + return true; } @@ -1296,5 +1296,5 @@ if (dest == NULL) return (char *) NULL; - + str_cpy(dest, size, src); return dest; @@ -1326,9 +1326,9 @@ if (size > n) size = n; - + char *dest = (char *) malloc(size + 1); if (dest == NULL) return (char *) NULL; - + str_ncpy(dest, size + 1, src, size); return dest; @@ -1353,5 +1353,5 @@ if (!s) return NULL; - + size_t len = str_size(s); size_t cur; @@ -1398,12 +1398,12 @@ assert(neg != NULL); assert(result != NULL); - + *neg = false; const char *str = nptr; - + /* Ignore leading whitespace */ while (isspace(*str)) str++; - + if (*str == '-') { *neg = true; @@ -1411,13 +1411,13 @@ } else if (*str == '+') str++; - + if (base == 0) { /* Decode base if not specified */ base = 10; - + if (*str == '0') { base = 8; str++; - + switch (*str) { case 'b': @@ -1454,11 +1454,11 @@ } } - + *result = 0; const char *startstr = str; - + while (*str != 0) { unsigned int digit; - + if ((*str >= 'a') && (*str <= 'z')) digit = *str - 'a' + 10; @@ -1469,11 +1469,11 @@ else break; - + if (digit >= base) break; - + uint64_t prev = *result; *result = (*result) * base + digit; - + if (*result < prev) { /* Overflow */ @@ -1481,8 +1481,8 @@ return EOVERFLOW; } - + str++; } - + if (str == startstr) { /* @@ -1492,10 +1492,10 @@ str = nptr; } - + *endptr = (char *) str; - + if (str == nptr) return EINVAL; - + return EOK; } @@ -1517,32 +1517,32 @@ { assert(result != NULL); - + bool neg; char *lendptr; uint64_t res; errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res); - + if (endptr != NULL) *endptr = (char *) lendptr; - + if (ret != EOK) return ret; - + /* Do not allow negative values */ if (neg) return EINVAL; - + /* Check whether we are at the end of the string in strict mode */ if ((strict) && (*lendptr != 0)) return EINVAL; - + /* Check for overflow */ uint8_t _res = (uint8_t) res; if (_res != res) return EOVERFLOW; - + *result = _res; - + return EOK; } @@ -1564,32 +1564,32 @@ { assert(result != NULL); - + bool neg; char *lendptr; uint64_t res; errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res); - + if (endptr != NULL) *endptr = (char *) lendptr; - + if (ret != EOK) return ret; - + /* Do not allow negative values */ if (neg) return EINVAL; - + /* Check whether we are at the end of the string in strict mode */ if ((strict) && (*lendptr != 0)) return EINVAL; - + /* Check for overflow */ uint16_t _res = (uint16_t) res; if (_res != res) return EOVERFLOW; - + *result = _res; - + return EOK; } @@ -1611,32 +1611,32 @@ { assert(result != NULL); - + bool neg; char *lendptr; uint64_t res; errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res); - + if (endptr != NULL) *endptr = (char *) lendptr; - + if (ret != EOK) return ret; - + /* Do not allow negative values */ if (neg) return EINVAL; - + /* Check whether we are at the end of the string in strict mode */ if ((strict) && (*lendptr != 0)) return EINVAL; - + /* Check for overflow */ uint32_t _res = (uint32_t) res; if (_res != res) return EOVERFLOW; - + *result = _res; - + return EOK; } @@ -1658,24 +1658,24 @@ { assert(result != NULL); - + bool neg; char *lendptr; errno_t ret = str_uint(nptr, &lendptr, base, &neg, result); - + if (endptr != NULL) *endptr = (char *) lendptr; - + if (ret != EOK) return ret; - + /* Do not allow negative values */ if (neg) return EINVAL; - + /* Check whether we are at the end of the string in strict mode */ if ((strict) && (*lendptr != 0)) return EINVAL; - + return EOK; } @@ -1697,32 +1697,32 @@ { assert(result != NULL); - + bool neg; char *lendptr; uint64_t res; errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res); - + if (endptr != NULL) *endptr = (char *) lendptr; - + if (ret != EOK) return ret; - + /* Do not allow negative values */ if (neg) return EINVAL; - + /* Check whether we are at the end of the string in strict mode */ if ((strict) && (*lendptr != 0)) return EINVAL; - + /* Check for overflow */ size_t _res = (size_t) res; if (_res != res) return EOVERFLOW; - + *result = _res; - + return EOK; } Index: uspace/lib/c/generic/sysinfo.c =================================================================== --- uspace/lib/c/generic/sysinfo.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/sysinfo.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -73,5 +73,5 @@ * and transfer the keys as a single atomic operation. */ - + /* Get the keys size */ errno_t ret = sysinfo_get_keys_size(path, size); @@ -83,5 +83,5 @@ return NULL; } - + char *data = malloc(*size); if (data == NULL) { @@ -89,5 +89,5 @@ return NULL; } - + /* Get the data */ size_t sz; @@ -99,5 +99,5 @@ return data; } - + free(data); *size = 0; @@ -166,5 +166,5 @@ * and transfer the data as a single atomic operation. */ - + /* Get the binary data size */ errno_t ret = sysinfo_get_data_size(path, size); @@ -177,5 +177,5 @@ return NULL; } - + void *data = malloc(*size); if (data == NULL) { @@ -183,5 +183,5 @@ return NULL; } - + /* Get the data */ size_t sz; @@ -193,5 +193,5 @@ return data; } - + free(data); *size = 0; @@ -219,5 +219,5 @@ return NULL; } - + size_t pos = 0; while (pos < total_size) { @@ -226,36 +226,36 @@ if (((char *) data)[pos + cur_size] != 0) break; - + bool found = (str_cmp(data + pos, name) == 0); - + pos += cur_size + 1; if (pos >= total_size) break; - + /* Process value size */ size_t value_size; memcpy(&value_size, data + pos, sizeof(value_size)); - + pos += sizeof(value_size); if ((pos >= total_size) || (pos + value_size > total_size)) break; - + if (found) { void *value = malloc(value_size); if (value == NULL) break; - + memcpy(value, data + pos, value_size); free(data); - + *size = value_size; return value; } - + pos += value_size; } - + free(data); - + *size = 0; return NULL; Index: uspace/lib/c/generic/task.c =================================================================== --- uspace/lib/c/generic/task.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/task.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -55,8 +55,8 @@ task_id_t task_id; (void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id); - + return task_id; #endif /* __32_BITS__ */ - + #ifdef __64_BITS__ return (task_id_t) __SYSCALL0(SYS_TASK_GET_ID); @@ -74,5 +74,5 @@ { assert(name); - + return (errno_t) __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_size(name)); } @@ -108,13 +108,13 @@ { /* Send default files */ - + int fd_stdin = -1; int fd_stdout = -1; int fd_stderr = -1; - + if (stdin != NULL) { (void) vfs_fhandle(stdin, &fd_stdin); } - + if (stdout != NULL) { (void) vfs_fhandle(stdout, &fd_stdout); @@ -124,5 +124,5 @@ (void) vfs_fhandle(stderr, &fd_stderr); } - + return task_spawnvf(id, wait, path, args, fd_stdin, fd_stdout, fd_stderr); @@ -153,7 +153,7 @@ if (ldr == NULL) return EREFUSED; - + bool wait_initialized = false; - + /* Get task ID. */ task_id_t task_id; @@ -161,20 +161,20 @@ if (rc != EOK) goto error; - + /* Send spawner's current working directory. */ rc = loader_set_cwd(ldr); if (rc != EOK) goto error; - + /* Send program binary. */ rc = loader_set_program_path(ldr, path); if (rc != EOK) goto error; - + /* Send arguments. */ rc = loader_set_args(ldr, args); if (rc != EOK) goto error; - + /* Send files */ int root = vfs_root(); @@ -185,5 +185,5 @@ goto error; } - + if (fd_stdin >= 0) { rc = loader_add_inbox(ldr, "stdin", fd_stdin); @@ -191,5 +191,5 @@ goto error; } - + if (fd_stdout >= 0) { rc = loader_add_inbox(ldr, "stdout", fd_stdout); @@ -197,5 +197,5 @@ goto error; } - + if (fd_stderr >= 0) { rc = loader_add_inbox(ldr, "stderr", fd_stderr); @@ -203,10 +203,10 @@ goto error; } - + /* Load the program. */ rc = loader_load_program(ldr); if (rc != EOK) goto error; - + /* Setup waiting for return value if needed */ if (wait) { @@ -216,20 +216,20 @@ wait_initialized = true; } - + /* Run it. */ rc = loader_run(ldr); if (rc != EOK) goto error; - + /* Success */ if (id != NULL) *id = task_id; - + return EOK; - + error: if (wait_initialized) task_cancel_wait(wait); - + /* Error exit */ loader_abort(ldr); @@ -259,5 +259,5 @@ if (arglist == NULL) return ENOMEM; - + /* Fill in arguments. */ const char *arg; @@ -267,8 +267,8 @@ arglist[cnt++] = arg; } while (arg != NULL); - + /* Spawn task. */ errno_t rc = task_spawnv(task_id, wait, path, arglist); - + /* Free argument list. */ free(arglist); @@ -293,9 +293,9 @@ { /* Count the number of arguments. */ - + va_list ap; const char *arg; int cnt = 0; - + va_start(ap, path); do { @@ -304,9 +304,9 @@ } while (arg != NULL); va_end(ap); - + va_start(ap, path); errno_t rc = task_spawn(task_id, wait, path, cnt, ap); va_end(ap); - + return rc; } @@ -400,5 +400,5 @@ if (rc != EOK) return rc; - + return task_wait(&wait, texit, retval); } @@ -413,5 +413,5 @@ errno_t rc = (errno_t) async_req_1_0(exch, NS_RETVAL, val); async_exchange_end(exch); - + return rc; } Index: uspace/lib/c/generic/thread.c =================================================================== --- uspace/lib/c/generic/thread.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/thread.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -65,12 +65,12 @@ if (fibril == NULL) thread_exit(0); - + __tcb_set(fibril->tcb); - + #ifdef FUTEX_UPGRADABLE rcu_register_fibril(); futex_upgrade_all_and_wait(); #endif - + uarg->uspace_thread_function(uarg->uspace_thread_arg); /* @@ -80,5 +80,5 @@ * free(uarg); */ - + /* If there is a manager, destroy it */ async_destroy_manager(); @@ -87,7 +87,7 @@ rcu_deregister_fibril(); #endif - + fibril_teardown(fibril, false); - + thread_exit(0); } @@ -112,5 +112,5 @@ if (!uarg) return ENOMEM; - + size_t stack_size = stack_size_get(); void *stack = as_area_create(AS_AREA_ANY, stack_size, @@ -121,8 +121,8 @@ return ENOMEM; } - + /* Make heap thread safe. */ malloc_enable_multithreaded(); - + uarg->uspace_entry = (void *) FADDR(__thread_entry); uarg->uspace_stack = stack; @@ -131,8 +131,8 @@ uarg->uspace_thread_arg = arg; uarg->uspace_uarg = uarg; - + errno_t rc = (errno_t) __SYSCALL4(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name, (sysarg_t) str_size(name), (sysarg_t) tid); - + if (rc != EOK) { /* @@ -143,5 +143,5 @@ free(uarg); } - + return rc; } @@ -155,5 +155,5 @@ { __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status); - + /* Unreachable */ while (1); @@ -214,12 +214,12 @@ * full argument range */ - + while (sec > 0) { unsigned int period = (sec > 1000) ? 1000 : sec; - + thread_usleep(period * 1000000); sec -= period; } - + return 0; } Index: uspace/lib/c/generic/time.c =================================================================== --- uspace/lib/c/generic/time.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/time.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -82,14 +82,14 @@ { year += 1900; - + if (year % 400 == 0) return true; - + if (year % 100 == 0) return false; - + if (year % 4 == 0) return true; - + return false; } @@ -110,9 +110,9 @@ assert(mon >= 0); assert(mon <= 11); - + static int month_days[] = { 31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; - + if (mon == 1) { /* February */ @@ -120,5 +120,5 @@ return is_leap_year(year) ? 29 : 28; } - + return month_days[mon]; } @@ -144,9 +144,9 @@ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; - + static int leap_mdays[] = { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }; - + return (is_leap_year(year) ? leap_mdays[mon] : mdays[mon]) + mday - 1; } @@ -166,5 +166,5 @@ if ((op1 >= 0) || (op1 % op2 == 0)) return op1 / op2; - + return op1 / op2 - 1; } @@ -183,17 +183,17 @@ { time_t div = floor_div(op1, op2); - + /* * (a / b) * b + a % b == a * Thus: a % b == a - (a / b) * b */ - + time_t result = op1 - div * op2; - + /* Some paranoid checking to ensure there is mistake here. */ assert(result >= 0); assert(result < op2); assert(div * op2 + result == op1); - + return result; } @@ -261,5 +261,5 @@ { // TODO: DST correction - + /* Set initial values. */ time_t usec = tm->tm_usec + tv->tv_usec; @@ -270,5 +270,5 @@ time_t mon = tm->tm_mon; time_t year = tm->tm_year; - + /* Adjust time. */ sec += floor_div(usec, USECS_PER_SEC); @@ -280,15 +280,15 @@ day += floor_div(hour, HOURS_PER_DAY); hour = floor_mod(hour, HOURS_PER_DAY); - + /* Adjust month. */ year += floor_div(mon, 12); mon = floor_mod(mon, 12); - + /* Now the difficult part - days of month. */ - + /* First, deal with whole cycles of 400 years = 146097 days. */ year += floor_div(day, 146097) * 400; day = floor_mod(day, 146097); - + /* Then, go in one year steps. */ if (mon <= 1) { @@ -305,10 +305,10 @@ } } - + /* Finally, finish it off month per month. */ while (day >= days_in_month(year, mon)) { day -= days_in_month(year, mon); mon++; - + if (mon >= 12) { mon -= 12; @@ -316,9 +316,9 @@ } } - + /* Calculate the remaining two fields. */ tm->tm_yday = day_of_year(year, mon, day + 1); tm->tm_wday = day_of_week(year, mon, day + 1); - + /* And put the values back to the struct. */ tm->tm_usec = (int) usec; @@ -328,5 +328,5 @@ tm->tm_mday = (int) day + 1; tm->tm_mon = (int) mon; - + /* Casts to work around POSIX brain-damage. */ if (year > ((int) INT_MAX) || year < ((int) INT_MIN)) { @@ -334,5 +334,5 @@ return -1; } - + tm->tm_year = (int) year; return 0; @@ -363,5 +363,5 @@ { int start_wday = day_of_week(year, 0, 1); - + return floor_mod(4 - start_wday, 7) - 3; } @@ -377,15 +377,15 @@ { int day = tm->tm_yday - wbyear_offset(tm->tm_year); - + if (day < 0) { /* Last week of previous year. */ return tm->tm_year - 1; } - + if (day > 364 + is_leap_year(tm->tm_year)) { /* First week of next year. */ return tm->tm_year + 1; } - + /* All the other days are in the calendar year. */ return tm->tm_year; @@ -405,5 +405,5 @@ { int first_day = (7 - day_of_week(tm->tm_year, 0, 1)) % 7; - + return (tm->tm_yday - first_day + 7) / 7; } @@ -425,15 +425,15 @@ { int day = tm->tm_yday - wbyear_offset(tm->tm_year); - + if (day < 0) { /* Last week of previous year. */ return 53; } - + if (day > 364 + is_leap_year(tm->tm_year)) { /* First week of next year. */ return 1; } - + /* All the other days give correct answer. */ return (day / 7 + 1); @@ -453,5 +453,5 @@ { int first_day = (1 - day_of_week(tm->tm_year, 0, 1)) % 7; - + return (tm->tm_yday - first_day + 7) / 7; } @@ -535,8 +535,8 @@ if (tv1->tv_sec > tv2->tv_sec) return true; - + if ((tv1->tv_sec == tv2->tv_sec) && (tv1->tv_usec > tv2->tv_usec)) return true; - + return false; } @@ -555,8 +555,8 @@ if (tv1->tv_sec > tv2->tv_sec) return true; - + if ((tv1->tv_sec == tv2->tv_sec) && (tv1->tv_usec >= tv2->tv_usec)) return true; - + return false; } @@ -582,5 +582,5 @@ tz->tz_dsttime = DST_NONE; } - + if (clock_conn == NULL) { category_id_t cat_id; @@ -588,5 +588,5 @@ if (rc != EOK) goto fallback; - + service_id_t *svc_ids; size_t svc_cnt; @@ -594,8 +594,8 @@ if (rc != EOK) goto fallback; - + if (svc_cnt == 0) goto fallback; - + char *svc_name; rc = loc_service_get_name(svc_ids[0], &svc_name); @@ -603,5 +603,5 @@ if (rc != EOK) goto fallback; - + service_id_t svc_id; rc = loc_service_get_id(svc_name, &svc_id, 0); @@ -609,5 +609,5 @@ if (rc != EOK) goto fallback; - + clock_conn = loc_service_connect(svc_id, INTERFACE_DDF, IPC_FLAG_BLOCKING); @@ -615,15 +615,15 @@ goto fallback; } - + struct tm time; errno_t rc = clock_dev_time_get(clock_conn, &time); if (rc != EOK) goto fallback; - + tv->tv_usec = time.tm_usec; tv->tv_sec = mktime(&time); - + return; - + fallback: getuptime(tv); @@ -639,5 +639,5 @@ goto fallback; } - + void *addr = AS_AREA_ANY; rc = physmem_map(faddr, 1, AS_AREA_READ | AS_AREA_CACHEABLE, @@ -648,16 +648,16 @@ goto fallback; } - + ktime = addr; } - + sysarg_t s2 = ktime->seconds2; - + read_barrier(); tv->tv_usec = ktime->useconds; - + read_barrier(); sysarg_t s1 = ktime->seconds1; - + if (s1 != s2) { tv->tv_sec = max(s1, s2); @@ -665,7 +665,7 @@ } else tv->tv_sec = s1; - + return; - + fallback: tv->tv_sec = 0; @@ -677,8 +677,8 @@ struct timeval tv; gettimeofday(&tv, NULL); - + if (tloc) *tloc = tv.tv_sec; - + return tv.tv_sec; } @@ -706,5 +706,5 @@ // TODO: take DST flag into account // TODO: detect overflow - + normalize_tm_time(tm, 0); return secs_since_epoch(tm); @@ -755,33 +755,33 @@ assert(format != NULL); assert(tm != NULL); - + // TODO: use locale - + static const char *wday_abbr[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; - + static const char *wday[] = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; - + static const char *mon_abbr[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - + static const char *mon[] = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; - + if (maxsize < 1) return 0; - + char *ptr = s; size_t consumed; size_t remaining = maxsize; - + while (*format != '\0') { if (*format != '%') { @@ -790,5 +790,5 @@ continue; } - + format++; if ((*format == '0') || (*format == '+')) { @@ -796,15 +796,15 @@ format++; } - + while (isdigit(*format)) { // TODO: padding format++; } - + if ((*format == 'O') || (*format == 'E')) { // TODO: locale's alternative format format++; } - + switch (*format) { case 'a': @@ -938,12 +938,12 @@ while (*format != '%') format--; - + APPEND("%%"); break; } - + format++; } - + return maxsize - remaining; } @@ -960,5 +960,5 @@ { assert(result != NULL); - + /* Set result to epoch. */ result->tm_usec = 0; @@ -969,8 +969,8 @@ result->tm_mon = 0; result->tm_year = 70; /* 1970 */ - + if (normalize_tm_time(result, time) == -1) return EOVERFLOW; - + return EOK; } @@ -993,5 +993,5 @@ if (ret != EOK) return ret; - + time_tm2str(&tm, buf); return EOK; @@ -1011,14 +1011,14 @@ assert(timeptr != NULL); assert(buf != NULL); - + static const char *wday[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; - + static const char *mon[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - + snprintf(buf, ASCTIME_BUF_LEN, "%s %s %2d %02d:%02d:%02d %d\n", wday[timeptr->tm_wday], @@ -1043,5 +1043,5 @@ // TODO: Deal with timezones. // Currently assumes system and all times are in UTC - + /* Set result to epoch. */ result->tm_usec = 0; @@ -1052,8 +1052,8 @@ result->tm_mon = 0; result->tm_year = 70; /* 1970 */ - + if (normalize_tm_tv(result, tv) == -1) return EOVERFLOW; - + return EOK; } @@ -1097,5 +1097,5 @@ if (ret != EOK) return ret; - + time_tm2str(&loctime, buf); return EOK; Index: uspace/lib/c/generic/tls.c =================================================================== --- uspace/lib/c/generic/tls.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/tls.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -74,14 +74,14 @@ tcb_t *tcb; size_t tls_size = &_tbss_end - &_tdata_start; - + #ifdef CONFIG_RTLD if (runtime_env != NULL) return rtld_tls_make(runtime_env); #endif - + tcb = tls_alloc_arch(&data, tls_size); if (!tcb) return NULL; - + /* * Copy thread local data from the initialization image. @@ -119,5 +119,5 @@ if (!tcb) return NULL; - + *data = ((void *) tcb) + sizeof(tcb_t); #ifdef CONFIG_RTLD @@ -150,5 +150,5 @@ { tcb_t *tcb; - + size = ALIGN_UP(size, &_tls_alignment); *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size); Index: uspace/lib/c/generic/udebug.c =================================================================== --- uspace/lib/c/generic/udebug.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/udebug.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -61,12 +61,12 @@ { sysarg_t a_copied, a_needed; - + async_exch_t *exch = async_exchange_begin(sess); errno_t rc = async_req_3_3(exch, IPC_M_DEBUG, UDEBUG_M_THREAD_READ, (sysarg_t) buffer, n, NULL, &a_copied, &a_needed); - + *copied = (size_t) a_copied; *needed = (size_t) a_needed; - + return rc; } @@ -76,12 +76,12 @@ { sysarg_t a_copied, a_needed; - + async_exch_t *exch = async_exchange_begin(sess); errno_t rc = async_req_3_3(exch, IPC_M_DEBUG, UDEBUG_M_NAME_READ, (sysarg_t) buffer, n, NULL, &a_copied, &a_needed); - + *copied = (size_t) a_copied; *needed = (size_t) a_needed; - + return rc; } @@ -91,12 +91,12 @@ { sysarg_t a_copied, a_needed; - + async_exch_t *exch = async_exchange_begin(sess); errno_t rc = async_req_3_3(exch, IPC_M_DEBUG, UDEBUG_M_AREAS_READ, (sysarg_t) buffer, n, NULL, &a_copied, &a_needed); - + *copied = (size_t) a_copied; *needed = (size_t) a_needed; - + return rc; } @@ -127,9 +127,9 @@ { sysarg_t a_ev_type; - + async_exch_t *exch = async_exchange_begin(sess); errno_t rc = async_req_2_3(exch, IPC_M_DEBUG, UDEBUG_M_GO, tid, &a_ev_type, val0, val1); - + *ev_type = a_ev_type; return rc; Index: uspace/lib/c/generic/vfs/canonify.c =================================================================== --- uspace/lib/c/generic/vfs/canonify.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/vfs/canonify.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -329,5 +329,5 @@ t = next_token(&t); } - + switch (state) { case S_RESTART: Index: uspace/lib/c/generic/vfs/inbox.c =================================================================== --- uspace/lib/c/generic/vfs/inbox.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/vfs/inbox.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -79,5 +79,5 @@ { inbox_entry *next = NULL; - + list_foreach(inb_list, link, inbox_entry, e) { int cmp = str_cmp(e->name, name); Index: uspace/lib/c/generic/vfs/mtab.c =================================================================== --- uspace/lib/c/generic/vfs/mtab.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/vfs/mtab.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -59,5 +59,5 @@ else str_cpy(ent->fs_name, sizeof(ent->fs_name), "?"); - + list_append(&ent->link, mtab_list); } Index: uspace/lib/c/generic/vfs/vfs.c =================================================================== --- uspace/lib/c/generic/vfs/vfs.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/vfs/vfs.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -264,13 +264,13 @@ { fibril_mutex_lock(&cwd_mutex); - + if ((cwd_size == 0) || (size < cwd_size + 1)) { fibril_mutex_unlock(&cwd_mutex); return ERANGE; } - + str_cpy(buf, size, cwd_path); fibril_mutex_unlock(&cwd_mutex); - + return EOK; } @@ -288,5 +288,5 @@ if (!abs) return ENOMEM; - + int fd; errno_t rc = vfs_lookup(abs, WALK_DIRECTORY, &fd); @@ -295,17 +295,17 @@ return rc; } - + fibril_mutex_lock(&cwd_mutex); - + if (cwd_fd >= 0) vfs_put(cwd_fd); - + if (cwd_path) free(cwd_path); - + cwd_fd = fd; cwd_path = abs; cwd_size = abs_size; - + fibril_mutex_unlock(&cwd_mutex); return EOK; @@ -319,12 +319,12 @@ { fibril_mutex_lock(&vfs_mutex); - + while (vfs_sess == NULL) { vfs_sess = service_connect_blocking(SERVICE_VFS, INTERFACE_VFS, 0); } - + fibril_mutex_unlock(&vfs_mutex); - + return async_exchange_begin(vfs_sess); } @@ -356,8 +356,8 @@ if (rc != EOK) return NULL; - + if (stat.service == 0) return NULL; - + return loc_service_connect(stat.service, iface, 0); } @@ -376,22 +376,22 @@ { errno_t rc; - + ipc_call_t answer; async_exch_t *exch = vfs_exchange_begin(); aid_t req = async_send_1(exch, VFS_IN_FSPROBE, serv, &answer); - + rc = async_data_write_start(exch, (void *) fs_name, str_size(fs_name)); - + async_wait_for(req, &rc); - + if (rc != EOK) { vfs_exchange_end(exch); return rc; } - + rc = async_data_read_start(exch, info, sizeof(*info)); vfs_exchange_end(exch); - + return rc; } @@ -620,10 +620,10 @@ { errno_t rc, rc1; - + if (!mountedfd) flags |= VFS_MOUNT_NO_REF; if (mp < 0) flags |= VFS_MOUNT_CONNECT_ONLY; - + ipc_call_t answer; async_exch_t *exch = vfs_exchange_begin(); @@ -643,5 +643,5 @@ if (mountedfd) *mountedfd = (int) IPC_GET_ARG1(answer); - + if (rc != EOK) return rc; @@ -665,5 +665,5 @@ int null_id = -1; char null[LOC_NAME_MAXLEN]; - + if (str_cmp(fqsn, "") == 0) { /* @@ -671,17 +671,17 @@ */ null_id = loc_null_create(); - + if (null_id == -1) return ENOMEM; - + snprintf(null, LOC_NAME_MAXLEN, "null/%d", null_id); fqsn = null; } - + if (flags & IPC_FLAG_BLOCKING) flags = VFS_MOUNT_BLOCKING; else flags = 0; - + service_id_t service_id; errno_t res = loc_service_get_id(fqsn, &service_id, flags); @@ -689,8 +689,8 @@ if (null_id != -1) loc_null_destroy(null_id); - + return res; } - + size_t mpa_size; char *mpa = vfs_absolutize(mp, &mpa_size); @@ -698,15 +698,15 @@ if (null_id != -1) loc_null_destroy(null_id); - + return ENOMEM; } - + fibril_mutex_lock(&root_mutex); - + errno_t rc; - + if (str_cmp(mpa, "/") == 0) { /* Mounting root. */ - + if (root_fd >= 0) { fibril_mutex_unlock(&root_mutex); @@ -715,5 +715,5 @@ return EBUSY; } - + int root; rc = vfs_mount(-1, fs_name, service_id, opts, flags, instance, @@ -728,5 +728,5 @@ return EINVAL; } - + int mpfd; rc = vfs_walk(root_fd, mpa, WALK_DIRECTORY, &mpfd); @@ -737,10 +737,10 @@ } } - + fibril_mutex_unlock(&root_mutex); - + if ((rc != EOK) && (null_id != -1)) loc_null_destroy(null_id); - + return (errno_t) rc; } @@ -759,5 +759,5 @@ errno_t rc = async_req_2_0(exch, VFS_IN_OPEN, file, mode); vfs_exchange_end(exch); - + return rc; } @@ -788,5 +788,5 @@ errno_t rc = async_req_1_0(exch, VFS_IN_PUT, file); vfs_exchange_end(exch); - + return rc; } @@ -845,5 +845,5 @@ uint8_t *bp = (uint8_t *) buf; errno_t rc; - + do { bp += cnt; @@ -852,10 +852,10 @@ rc = vfs_read_short(file, *pos, bp, nbyte - nr, &cnt); } while (rc == EOK && cnt > 0 && (nbyte - nr - cnt) > 0); - + if (rc != EOK) { *nread = nr; return rc; } - + nr += cnt; *pos += cnt; @@ -885,10 +885,10 @@ ipc_call_t answer; aid_t req; - + if (nbyte > DATA_XFER_LIMIT) nbyte = DATA_XFER_LIMIT; - - async_exch_t *exch = vfs_exchange_begin(); - + + async_exch_t *exch = vfs_exchange_begin(); + req = async_send_3(exch, VFS_IN_READ, file, LOWER32(pos), UPPER32(pos), &answer); @@ -896,13 +896,13 @@ vfs_exchange_end(exch); - + if (rc == EOK) async_wait_for(req, &rc); else async_forget(req); - + if (rc != EOK) return rc; - + *nread = (ssize_t) IPC_GET_ARG1(answer); return EOK; @@ -926,5 +926,5 @@ errno_t rc_orig; aid_t req; - + size_t olda_size; char *olda = vfs_absolutize(old, &olda_size); @@ -938,5 +938,5 @@ return ENOMEM; } - + async_exch_t *exch = vfs_exchange_begin(); int root = vfs_root(); @@ -946,5 +946,5 @@ return ENOENT; } - + req = async_send_1(exch, VFS_IN_RENAME, root, NULL); rc = async_data_write_start(exch, olda, olda_size); @@ -994,5 +994,5 @@ UPPER32(length)); vfs_exchange_end(exch); - + return rc; } @@ -1056,24 +1056,24 @@ errno_t rc; aid_t req; - - async_exch_t *exch = vfs_exchange_begin(); - + + async_exch_t *exch = vfs_exchange_begin(); + req = async_send_1(exch, VFS_IN_STAT, file, NULL); rc = async_data_read_start(exch, (void *) stat, sizeof(vfs_stat_t)); if (rc != EOK) { vfs_exchange_end(exch); - + errno_t rc_orig; async_wait_for(req, &rc_orig); - + if (rc_orig != EOK) rc = rc_orig; - - return rc; - } - + + return rc; + } + vfs_exchange_end(exch); async_wait_for(req, &rc); - + return rc; } @@ -1092,5 +1092,5 @@ if (rc != EOK) return rc; - + rc = vfs_stat(file, stat); @@ -1138,5 +1138,5 @@ if (rc != EOK) return rc; - + rc = vfs_statfs(file, st); @@ -1157,5 +1157,5 @@ errno_t rc = async_req_1_0(exch, VFS_IN_SYNC, file); vfs_exchange_end(exch); - + return rc; } @@ -1178,15 +1178,15 @@ errno_t rc; aid_t req; - - async_exch_t *exch = vfs_exchange_begin(); - + + async_exch_t *exch = vfs_exchange_begin(); + req = async_send_2(exch, VFS_IN_UNLINK, parent, expect, NULL); rc = async_data_write_start(exch, child, str_size(child)); - - vfs_exchange_end(exch); - + + vfs_exchange_end(exch); + errno_t rc_orig; async_wait_for(req, &rc_orig); - + if (rc_orig != EOK) return (errno_t) rc_orig; @@ -1219,5 +1219,5 @@ rc = vfs_unlink(parent, child, expect); - + free(child); vfs_put(parent); @@ -1252,5 +1252,5 @@ if (rc != EOK) return rc; - + rc = vfs_unmount(mp); vfs_put(mp); @@ -1270,10 +1270,10 @@ { async_exch_t *exch = vfs_exchange_begin(); - + ipc_call_t answer; aid_t req = async_send_2(exch, VFS_IN_WALK, parent, flags, &answer); errno_t rc = async_data_write_start(exch, path, str_size(path)); vfs_exchange_end(exch); - + errno_t rc_orig; async_wait_for(req, &rc_orig); @@ -1281,8 +1281,8 @@ if (rc_orig != EOK) return (errno_t) rc_orig; - + if (rc != EOK) return (errno_t) rc; - + *handle = (int) IPC_GET_ARG1(answer); return EOK; @@ -1349,16 +1349,16 @@ ipc_call_t answer; aid_t req; - + if (nbyte > DATA_XFER_LIMIT) nbyte = DATA_XFER_LIMIT; - - async_exch_t *exch = vfs_exchange_begin(); - + + async_exch_t *exch = vfs_exchange_begin(); + req = async_send_3(exch, VFS_IN_WRITE, file, LOWER32(pos), UPPER32(pos), &answer); rc = async_data_write_start(exch, (void *) buf, nbyte); - - vfs_exchange_end(exch); - + + vfs_exchange_end(exch); + if (rc == EOK) async_wait_for(req, &rc); @@ -1368,5 +1368,5 @@ if (rc != EOK) return rc; - + *nwritten = (ssize_t) IPC_GET_ARG1(answer); return EOK;