Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1426 → Rev 1427

/uspace/trunk/init/init.c
43,6 → 43,7
#include <errno.h>
#include <kbd.h>
#include <ipc/fb.h>
#include <async.h>
 
int a;
atomic_t ftx;
318,6 → 319,30
ipc_hangup(phoneid);
}
 
static void test_async_kbd()
{
int res;
ipcarg_t result;
ipc_call_t kbddata;
int phoneid;
aid_t aid;
 
printf("Test: Starting connect...\n");
while ((phoneid = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) < 0) {
};
printf("Test: Connected: %d\n", res);
printf("Test: pinging.\n");
while (1) {
aid = async_send_2(phoneid, KBD_GETCHAR, 0, 0, &kbddata);
async_wait_for(aid, NULL);
printf("%c", IPC_GET_ARG1(kbddata));
}
printf("Test: Hangin up\n");
ipc_hangup(phoneid);
}
 
static void test_pci()
{
int phone;
392,9 → 417,10
// test_connection_ipc();
// test_hangup();
// test_slam();
test_as_area_send();
// test_as_area_send();
// test_pci();
test_kbd();
// test_kbd();
test_async_kbd();
// test_fb();
 
printf("Hello\nThis is Init\n\nBye.");
/uspace/trunk/libc/include/thread.h
38,9 → 38,9
 
extern int thread_create(void (* function)(void *arg), void *arg, char *name);
extern void thread_exit(int status);
tcb_t * __make_tls(void);
tcb_t * __alloc_tls(void **data, size_t size);
void __free_tls(tcb_t *);
void __free_tls_arch(tcb_t *, size_t size);
extern tcb_t * __make_tls(void);
extern tcb_t * __alloc_tls(void **data, size_t size);
extern void __free_tls(tcb_t *);
extern void __free_tls_arch(tcb_t *, size_t size);
 
#endif
/uspace/trunk/libc/include/psthread.h
74,6 → 74,7
void psthread_add_ready(pstid_t ptid);
void psthread_add_manager(pstid_t psthrid);
void psthread_remove_manager(void);
pstid_t psthread_get_id(void);
 
static inline int psthread_schedule_next() {
return psthread_schedule_next_adv(PS_PREEMPT);
/uspace/trunk/libc/include/async.h
4,6 → 4,8
#include <ipc/ipc.h>
#include <psthread.h>
 
typedef ipc_callid_t aid_t;
 
int async_manager(void);
void async_create_manager(void);
void async_destroy_manager(void);
10,9 → 12,14
int _async_init(void);
ipc_callid_t async_get_call(ipc_call_t *data);
 
/* Should be defined by application */
pstid_t async_new_connection(ipc_callid_t callid, ipc_call_t *call,
void (*cthread)(ipc_callid_t,ipc_call_t *));
aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
ipc_call_t *dataptr);
void async_wait_for(aid_t amsgid, ipcarg_t *result);
 
 
/* Should be defined by application */
void client_connection(ipc_callid_t callid, ipc_call_t *call) __attribute__((weak));
 
#endif
/uspace/trunk/libc/generic/thread.c
42,6 → 42,7
#define THREAD_INITIAL_STACK_PAGES_NO 1
#endif
 
static LIST_INITIALIZE(thread_garbage);
 
extern char _tdata_start;
extern char _tdata_end;
145,3 → 146,4
{
__SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status);
}
 
/uspace/trunk/libc/generic/psthread.c
117,6 → 117,9
 
/** Schedule next userspace pseudo thread.
*
* If calling with PS_TO_MANAGER parameter, the async_futex should be
* held.
*
* @param tomanager If true, we are switching to next ready manager thread
* (if none is found, thread is exited)
* @param frommanager If true, we are switching from manager thread
136,8 → 139,11
goto ret_0;
}
/* If we are going to manager and none exists, create it */
if (ctype == PS_TO_MANAGER && list_empty(&manager_list))
while (ctype == PS_TO_MANAGER && list_empty(&manager_list)) {
futex_up(&psthread_futex);
async_create_manager();
futex_down(&psthread_futex);
}
 
pt = __tcb_get()->pst_data;
if (!context_save(&pt->ctx))
259,3 → 265,9
list_remove(manager_list.next);
futex_up(&psthread_futex);
}
 
/** Return thread id of current running thread */
pstid_t psthread_get_id(void)
{
return (pstid_t)__tcb_get()->pst_data;
}
/uspace/trunk/libc/generic/async.c
91,10 → 91,19
#include <assert.h>
#include <errno.h>
 
static atomic_t conn_futex = FUTEX_INITIALIZER;
static atomic_t async_futex = FUTEX_INITIALIZER;
static hash_table_t conn_hash_table;
 
typedef struct {
pstid_t ptid; /**< Thread waiting for this message */
int active; /**< If this thread is currently active */
int done; /**< If reply was received */
ipc_call_t *dataptr; /**< Pointer where the answer data
* should be stored */
ipcarg_t retval;
} amsg_t;
 
typedef struct {
link_t link;
ipc_callid_t callid;
ipc_call_t call;
115,7 → 124,6
__thread connection_t *PS_connection;
 
/* Hash table functions */
 
#define CONN_HASH_TABLE_CHAINS 32
 
static hash_index_t conn_hash(unsigned long *key)
146,6 → 154,8
.remove_callback = conn_remove
};
 
/*************************************************/
 
/** Try to route a call to an appropriate connection thread
*
*/
156,12 → 166,12
link_t *hlp;
unsigned long key;
 
futex_down(&conn_futex);
futex_down(&async_futex);
 
key = call->in_phone_hash;
hlp = hash_table_find(&conn_hash_table, &key);
if (!hlp) {
futex_up(&conn_futex);
futex_up(&async_futex);
return 0;
}
conn = hash_table_get_instance(hlp, connection_t, link);
176,7 → 186,7
psthread_add_ready(conn->ptid);
}
 
futex_up(&conn_futex);
futex_up(&async_futex);
 
return 1;
}
188,7 → 198,7
ipc_callid_t callid;
connection_t *conn;
futex_down(&conn_futex);
futex_down(&async_futex);
 
conn = PS_connection;
/* If nothing in queue, wait until something appears */
203,7 → 213,7
*call = msg->call;
free(msg);
futex_up(&conn_futex);
futex_up(&async_futex);
return callid;
}
 
236,10 → 246,10
conn->cthread(conn->callid, &conn->call);
 
/* Remove myself from connection hash table */
futex_down(&conn_futex);
futex_down(&async_futex);
key = conn->in_phone_hash;
hash_table_remove(&conn_hash_table, &key, 1);
futex_up(&conn_futex);
futex_up(&async_futex);
/* Answer all remaining messages with ehangup */
while (!list_empty(&conn->msg_queue)) {
msg = list_get_instance(conn->msg_queue.next, msg_t, link);
288,10 → 298,10
return NULL;
}
key = conn->in_phone_hash;
futex_down(&conn_futex);
futex_down(&async_futex);
/* Add connection to hash table */
hash_table_insert(&conn_hash_table, &key, &conn->link);
futex_up(&conn_futex);
futex_up(&async_futex);
 
psthread_add_ready(conn->ptid);
 
298,7 → 308,7
return conn->ptid;
}
 
/** Handle call to a task */
/** Handle call that was received */
static void handle_call(ipc_callid_t callid, ipc_call_t *call)
{
if (route_call(callid, call))
324,7 → 334,7
 
while (1) {
if (psthread_schedule_next_adv(PS_FROM_MANAGER)) {
futex_up(&conn_futex); /* conn_futex is always held
futex_up(&async_futex); /* async_futex is always held
* when entering manager thread
*/
continue;
333,6 → 343,7
 
if (callid & IPC_CALLID_ANSWERED)
continue;
 
handle_call(callid, &call);
}
}
346,7 → 357,7
*/
static int async_manager_thread(void *arg)
{
futex_up(&conn_futex); /* conn_futex is always locked when entering
futex_up(&async_futex); /* async_futex is always locked when entering
* manager */
async_manager();
}
375,3 → 386,77
}
}
 
/** IPC handler for messages in async framework
*
* Notify thread that is waiting for this message, that it arrived
*/
static void reply_received(void *private, int retval,
ipc_call_t *data)
{
amsg_t *msg = (amsg_t *) private;
 
msg->retval = retval;
 
futex_down(&async_futex);
/* Copy data after futex_down, just in case the
* call was detached
*/
if (msg->dataptr)
*msg->dataptr = *data;
msg->done = 1;
if (! msg->active) {
msg->active = 1;
psthread_add_ready(msg->ptid);
}
futex_up(&async_futex);
}
 
/** Send message and return id of the sent message
*
* The return value can be used as input for async_wait() to wait
* for completion.
*/
aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
ipc_call_t *dataptr)
{
amsg_t *msg;
 
msg = malloc(sizeof(*msg));
msg->active = 1;
msg->done = 0;
msg->dataptr = dataptr;
ipc_call_async_2(phoneid,method,arg1,arg2,msg,reply_received);
 
return (aid_t) msg;
}
 
/** Wait for a message sent by async framework
*
* @param amsgid Message ID to wait for
* @param retval Pointer to variable where will be stored retval
* of the answered message. If NULL, it is ignored.
*
*/
void async_wait_for(aid_t amsgid, ipcarg_t *retval)
{
amsg_t *msg = (amsg_t *) amsgid;
connection_t *conn;
 
futex_down(&async_futex);
if (msg->done) {
futex_up(&async_futex);
goto done;
}
 
msg->ptid = psthread_get_id();
msg->active = 0;
/* Leave locked async_futex when entering this function */
psthread_schedule_next_adv(PS_TO_MANAGER);
/* futex is up automatically after psthread_schedule_next...*/
done:
if (retval)
*retval = msg->retval;
free(msg);
}