Changeset c4c5de5 in mainline for libc/generic/psthread.c

Timestamp:

2006-03-24T14:29:19Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8fe1cdb

Parents:

520492a

Message:

Completed support for TLS in GCC (modifier thread) for ia32,amd64,ia64 and mips.

File:

• libc/generic/psthread.c (modified) (7 diffs)

libc/generic/psthread.c

@@ -40 +40 @@
 static void psthread_main(void);
 
+/** Setup PSthread information into TCB structure */
+psthread_data_t * psthread_setup(tcb_t *tcb)
+{
+        psthread_data_t *pt;
+
+        pt = malloc(sizeof(*pt));
+        if (!pt) {
+                return NULL;
+        }
+
+        tcb->pst_data = pt;
+        pt->tcb = tcb;
+
+        return pt;
+}
+
+void psthread_teardown(psthread_data_t *pt)
+{
+        free(pt);
+}
+
 /** Function to preempt to other pseudo thread without adding
  * currently running pseudo thread to ready_list.
@@ -60 +81 @@
 void psthread_main(void)
 {
-        psthread_data_t *pt = __tls_get();
+        psthread_data_t *pt = __tcb_get()->pst_data;
+
         pt->retval = pt->func(pt->arg);
 
@@ -81 +103 @@
                 return 0;
 
-        pt = __tls_get();
+        pt = __tcb_get()->pst_data;
         if (!context_save(&pt->ctx))
                 return 1;
@@ -104 +126 @@
 
         /* Handle psthrid = Kernel address -> it is wait for call */
-
         pt = (psthread_data_t *) psthrid;
 
         if (!pt->finished) {
-                mypt = __tls_get();
+                mypt = __tcb_get()->pst_data;
                 if (context_save(&((psthread_data_t *) mypt)->ctx)) {
                         pt->waiter = (psthread_data_t *) mypt;
@@ -117 +138 @@
 
         free(pt->stack);
-        __free_tls((psthread_data_t *) pt);
+        __free_tls(pt->tcb);
+        psthread_teardown((void *)pt);
 
         return retval;
@@ -133 +155 @@
 {
         psthread_data_t *pt;
+        tcb_t *tcb;
 
-        pt = __make_tls();
+        tcb = __make_tls();
+        if (!tcb)
+                return 0;
+
+        pt = psthread_setup(tcb);
+        if (!pt) {
+                __free_tls(tcb);
+                return 0;
+        }
         pt->stack = (char *) malloc(getpagesize());
 
         if (!pt->stack) {
+                __free_tls(tcb);
+                psthread_teardown(pt);
                 return 0;
         }
@@ -147 +180 @@
 
         context_save(&pt->ctx);
-        context_set(&pt->ctx, FADDR(psthread_main), pt->stack, getpagesize(), pt);
+        context_set(&pt->ctx, FADDR(psthread_main), pt->stack, getpagesize(),
+                    tcb);
 
         list_append(&pt->link, &ready_list);