HelenOS-historicHelenOSHelenOS-doc

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /uspace/trunk/libc/generic/psthread.c @ 1128

  → /uspace/trunk/libc/generic/psthread.c @ 1127

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1128 → Rev 1127

/uspace/trunk/libc/generic/psthread.c
36,13 → 36,12
static LIST_INITIALIZE(ready_list);
static void psthread_exit(void) __attribute__ ((noinline));
static void psthread_main(void);
static void ps_exit(void) __attribute__ ((noinline));
/** Function to preempt to other pseudo thread without adding
* currently running pseudo thread to ready_list.
/** Function to preempt to other thread without adding
* currently running thread to runqueue
*/
void psthread_exit(void)
void ps_exit(void)
{
psthread_data_t *pt;
51,13 → 50,13
printf("Cannot exit!!!\n");
_exit(0);
}
pt = list_get_instance(ready_list.next, psthread_data_t, link);
list_remove(&pt->link);
pt = list_get_instance(ready_list.next, psthread_data_t, list);
list_remove(&pt->list);
context_restore(&pt->ctx);
}
/** Function that is called on entry to new uspace thread */
void psthread_main(void)
static int psthread_main(void)
{
psthread_data_t *pt = __tls_get();
pt->retval = pt->func(pt->arg);
64,16 → 63,13
pt->finished = 1;
if (pt->waiter)
list_append(&pt->waiter->link, &ready_list);
list_append(&pt->waiter->list, &ready_list);
psthread_exit();
ps_exit();
}
/** Schedule next userspace pseudo thread.
*
* @return 0 if there is no ready pseudo thread, 1 otherwise.
*/
int psthread_schedule_next(void)
/** Do a preemption of userpace threads */
int ps_preempt(void)
{
psthread_data_t *pt;
81,23 → 77,18
return 0;
pt = __tls_get();
if (!context_save(&pt->ctx))
if (! context_save(&pt->ctx))
return 1;
list_append(&pt->link, &ready_list);
pt = list_get_instance(ready_list.next, psthread_data_t, link);
list_remove(&pt->link);
list_append(&pt->list, &ready_list);
pt = list_get_instance(ready_list.next, psthread_data_t, list);
list_remove(&pt->list);
context_restore(&pt->ctx);
}
/** Wait for uspace pseudo thread to finish.
*
* @param psthrid Pseudo thread to wait for.
*
* @return Value returned by the finished thread.
*/
int psthread_join(pstid_t psthrid)
/** Wait for uspace thread to finish */
int ps_join(pstid_t psthrid)
{
volatile psthread_data_t *pt, *mypt;
volatile int retval;
110,7 → 101,7
mypt = __tls_get();
if (context_save(&((psthread_data_t *) mypt)->ctx)) {
pt->waiter = (psthread_data_t *) mypt;
psthread_exit();
ps_exit();
}
}
retval = pt->retval;
122,12 → 113,8
}
/**
* Create a userspace thread and append it to ready list.
* Create a userspace thread
*
* @param func Pseudo thread function.
* @param arg Argument to pass to func.
*
* @return 0 on failure, TLS of the new pseudo thread.
*/
pstid_t psthread_create(int (*func)(void *), void *arg)
{
148,7 → 135,8
context_save(&pt->ctx);
context_set(&pt->ctx, FADDR(psthread_main), pt->stack, getpagesize(), pt);
list_append(&pt->link, &ready_list);
list_append(&pt->list, &ready_list);
return (pstid_t )pt;
}