Index: ns/Makefile =================================================================== --- ns/Makefile (revision 8a568e35b00fa4fcb8f95f836684c6e1217a8dbf) +++ ns/Makefile (revision babe786005b9357a2f47ef2edf4e666b83142f27) @@ -31,4 +31,5 @@ LIBC_PREFIX = ../libc +LIBADT_PREFIX = ../libadt LIBIPC_PREFIX = ../libipc SOFTINT_PREFIX = ../softint @@ -37,5 +38,5 @@ CFLAGS += -I../libipc/include -LIBS = $(LIBIPC_PREFIX)/libipc.a $(LIBC_PREFIX)/libc.a +LIBS = $(LIBADT_PREFIX)/libadt.a $(LIBIPC_PREFIX)/libipc.a $(LIBC_PREFIX)/libc.a ## Sources Index: ns/ns.c =================================================================== --- ns/ns.c (revision 8a568e35b00fa4fcb8f95f836684c6e1217a8dbf) +++ ns/ns.c (revision babe786005b9357a2f47ef2edf4e666b83142f27) @@ -1,2 +1,35 @@ +/* + * Copyright (C) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file ns.c + * @brief Naming service for HelenOS IPC. + */ + #include #include @@ -5,4 +38,33 @@ #include #include +#include +#include +#include + +#define NAME "NS" + +#define NS_HASH_TABLE_CHAINS 20 + +/* Static functions implementing NS hash table operations. */ +static hash_index_t ns_hash(unsigned long *key); +static int ns_compare(unsigned long *key, hash_count_t keys, link_t *item); + +/** Operations for NS hash table. */ +static hash_table_operations_t ns_hash_table_ops = { + .hash = ns_hash, + .compare = ns_compare, + .remove_callback = NULL +}; + +/** NS hash table structure. */ +static hash_table_t ns_hash_table; + +/** NS hash table item. */ +typedef struct { + link_t link; + ipcarg_t service; /**< Number of the service. */ + ipcarg_t phone; /**< Phone registered with the service. */ +} hashed_service_t; + /* irq_cmd_t msim_cmds[1] = { @@ -26,5 +88,6 @@ */ -static int service; + +int static ping_phone; int main(int argc, char **argv) @@ -36,10 +99,17 @@ ipcarg_t retval, arg1, arg2; - printf("NS:Name service started.\n"); + printf("%s: Name service started.\n", NAME); + + if (!hash_table_create(&ns_hash_table, NS_HASH_TABLE_CHAINS, 1, &ns_hash_table_ops)) { + printf("%s: cannot create hash table\n", NAME); + return ENOMEM; + } + + // ipc_register_irq(2, &msim_kbd); // ipc_register_irq(1, &i8042_kbd); while (1) { callid = ipc_wait_for_call(&call, 0); - printf("NS:Call phone=%lX..", call.phoneid); + printf("NS: Call phone=%lX...", call.phoneid); switch (IPC_GET_METHOD(call)) { case IPC_M_AS_SEND: @@ -61,7 +131,27 @@ retval = 0; break; - case IPC_M_CONNECT_TO_ME: - printf("Somebody connecting phid=%zd.\n", IPC_GET_ARG3(call)); - service = IPC_GET_ARG3(call); + case IPC_M_CONNECT_TO_ME:; + /* + * Request for registration of a service. + */ + ipcarg_t service; + ipcarg_t phone; + hashed_service_t *hs; + + service = IPC_GET_ARG1(call); + phone = IPC_GET_ARG3(call); + printf("Registering service %d on phone %d...", service, phone); + + hs = (hashed_service_t *) malloc(sizeof(hashed_service_t)); + if (!hs) { + printf("Failed to register service %d.\n", service); + } + + link_initialize(&hs->link); + hs->service = service; + hs->phone = phone; + hash_table_insert(&ns_hash_table, (unsigned long *) &service, &hs->link); + + ping_phone = phone; retval = 0; break; @@ -83,6 +173,6 @@ break; case NS_PING_SVC: - printf("NS:Pinging service %d\n", service); - ipc_call_sync(service, NS_PING, 0xbeef, 0); + printf("NS:Pinging service %d\n", ping_phone); + ipc_call_sync(ping_phone, NS_PING, 0xbeef, 0); printf("NS:Got pong\n"); break; @@ -93,7 +183,38 @@ } if (! (callid & IPC_CALLID_NOTIFICATION)) { - printf("Answerinh\n"); + printf("Answering.\n"); ipc_answer(callid, retval, arg1, arg2); } } } + +/** Compute hash index into NS hash table. + * + * @param key Pointer to single key (i.e. service number). + * @return Hash index corresponding to *key. + */ +hash_index_t ns_hash(unsigned long *key) +{ + assert(key); + return *key % NS_HASH_TABLE_CHAINS; +} + +/** Compare a key with hashed item. + * + * @param key Single key pointer. + * @param keys Must be 1. + * @param item Pointer to a hash table item. + * @return Non-zero if the key matches the item, zero otherwise. + */ +int ns_compare(unsigned long *key, hash_count_t keys, link_t *item) +{ + hashed_service_t *hs; + + assert(key); + assert(keys == 1); + assert(item); + + hs = hash_table_get_instance(item, hashed_service_t, link); + + return *key == hs->service; +}