+

kernel/libthr/thr_init.pas

@@ -6,30 +6,36 @@ unit thr_init;
 interface
 
 uses
+ mqueue,
+ time,
  pthread,
+ pthread_md,
  thr_umtx,
- thr_private;
+ thr_private,
+ thr;
 
 var
- _usrstack             :Pointer;
+ _usrstack             :Pointer=Pointer($FFFFFFEFFF); //USRSTACK kern.usrstack
  _thr_initial          :p_pthread;
  _thread_event_mask    :Integer;
  _thread_last_event    :p_pthread;
  _thread_list          :pthreadlist=(tqh_first:nil;tqh_last:@_thread_list.tqh_first);
  _thread_gc_list       :pthreadlist=(tqh_first:nil;tqh_last:@_thread_gc_list.tqh_first);
- _thread_active_threads:Integer=1;
+ _thread_active_threads:Integer=0;
  _thr_atfork_list      :atfork_head=(tqh_first:nil;tqh_last:@_thr_atfork_list.tqh_first);
  _thr_atfork_lock      :urwlock=(rw_state:0;rw_flags:0;
                                  rw_blocked_readers:0;
                                  rw_blocked_writers:0;
                                  rw_spare:(0,0,0,0));
 
+const
  _thr_priorities       :array[0..2] of pthread_prio=(
   (pri_min:256;pri_max:767;pri_default:700), //FIFO
   (pri_min:768;pri_max:959;pri_default:900), //OTHER
   (pri_min:256;pri_max:767;pri_default:700)  //RR
  );
 
+var
  _pthread_attr_default :pthread_attr=(
   sched_policy  :SCHED_FIFO;
   sched_inherit :PTHREAD_INHERIT_SCHED;
@@ -44,16 +50,31 @@ var
   cpusetsize    :0
  );
 
+ _pthread_mutexattr_default:pthread_mutex_attr=(
+  m_type    :PTHREAD_MUTEX_DEFAULT;
+  m_protocol:PTHREAD_PRIO_NONE;
+  m_ceiling :0
+ );
+
+ _pthread_mutexattr_adaptive_default:pthread_mutex_attr=(
+  m_type    :PTHREAD_MUTEX_ADAPTIVE;
+  m_protocol:PTHREAD_PRIO_NONE;
+  m_ceiling :0
+ );
+
+ _pthread_condattr_default:pthread_cond_attr=(
+  c_pshared:PTHREAD_PROCESS_PRIVATE;
+  c_clockid:CLOCK_REALTIME;
+ );
+
  _thr_pid:Integer;
 
-const
- _thr_is_smp:Integer=1;
- _thr_guard_default =THR_STACK_DEFAULT;
- _thr_stack_default =THR_STACK_DEFAULT;
- _thr_stack_initial =THR_STACK_INITIAL;
- _thr_page_size     =4*1024;
+ _thr_is_smp        :Integer=1; //kern.smp.cpus
+ _thr_guard_default :Integer;
+ _thr_stack_default :QWORD  =THR_STACK_DEFAULT;
+ _thr_stack_initial :QWORD  =THR_STACK_INITIAL;
+ _thr_page_size     :Integer=4*1024; //getpagesize
 
-var
  _thr_spinloops :Integer;
  _thr_yieldloops:Integer;
  _gc_count      :Integer;
@@ -70,8 +91,171 @@ var
 
  init_once:Integer=0;
 
+procedure THR_LIST_ADD(thrd:p_pthread);
+procedure THR_LIST_REMOVE(thrd:p_pthread);
+procedure THR_GCLIST_ADD(thrd:p_pthread);
+procedure THR_GCLIST_REMOVE(thrd:p_pthread);
+
+procedure _libpthread_init(curthread:p_pthread);
+
 implementation
 
+procedure THR_LIST_ADD(thrd:p_pthread);
+begin
+ if ((thrd^.tlflags and TLFLAGS_IN_TDLIST)=0) then
+ begin
+  TAILQ_INSERT_HEAD(@_thread_list,@thrd,@thrd^.tle);
+  //_thr_hash_add(thrd);
+  thrd^.tlflags:=thrd^.tlflags or TLFLAGS_IN_TDLIST;
+ end;
+end;
+
+procedure THR_LIST_REMOVE(thrd:p_pthread);
+begin
+ if (((thrd)^.tlflags and TLFLAGS_IN_TDLIST)<>0) then
+ begin
+  TAILQ_REMOVE(@_thread_list,@thrd,@thrd^.tle);
+  //_thr_hash_remove(thrd);
+  thrd^.tlflags:=thrd^.tlflags and (not TLFLAGS_IN_TDLIST);
+ end;
+end;
+
+procedure THR_GCLIST_ADD(thrd:p_pthread);
+begin
+ if ((thrd^.tlflags and TLFLAGS_IN_GCLIST)=0) then
+ begin
+  TAILQ_INSERT_HEAD(@_thread_gc_list,@thrd,@thrd^.gcle);
+  thrd^.tlflags:=thrd^.tlflags or TLFLAGS_IN_GCLIST;
+  Inc(_gc_count);
+ end;
+end;
+
+procedure THR_GCLIST_REMOVE(thrd:p_pthread);
+begin
+ if (((thrd)^.tlflags and TLFLAGS_IN_GCLIST)<>0) then
+ begin
+  TAILQ_REMOVE(@_thread_list,@thrd,@thrd^.gcle);
+  thrd^.tlflags:=thrd^.tlflags and (not TLFLAGS_IN_GCLIST);
+  Dec(_gc_count);
+ end;
+end;
+
+const
+ g_user_stacksize=$10000;
+
+procedure init_private;
+begin
+ _thr_umutex_init(@_mutex_static_lock);
+ _thr_umutex_init(@_cond_static_lock);
+ _thr_umutex_init(@_rwlock_static_lock);
+ _thr_umutex_init(@_keytable_lock);
+ _thr_urwlock_init(@_thr_atfork_lock);
+ _thr_umutex_init(@_thr_event_lock);
+ //_thr_once_init();
+ //_thr_spinlock_init();
+ //_thr_list_init();
+ //_thr_wake_addr_init();
+ //_sleepq_init();
+ if (init_once=0) then
+ begin
+  //mib[0]:=1;
+  //mib[1]:=33;
+  //len:=8;
+  //ret:=sysctl(mib,2,@_usrstack,@len,nil,0);
+  //if (ret=-1) then
+  //begin
+  // Writeln('Cannot get kern.usrstack from sysctl');
+  // Halt($229);
+  //end;
+  //len:=4;
+  //sysctlbyname('kern.smp.cpus',@_thr_is_smp,@len,0,0);
+  //_thr_is_smp:=(1<_thr_is_smp);
+  //_thr_page_size:=getpagesize();
+  _pthread_attr_default.guardsize_attr:=_thr_page_size;
+  _thr_guard_default:=_pthread_attr_default.guardsize_attr;
+  //pid:=getpid();
+  //ret:=IsSystemProcess(pid);
+  _thr_atfork_list.tqh_first:=nil;
+  _pthread_attr_default.stacksize_attr:=$200000;
+  //if (ret<>1) then
+  begin
+   _pthread_attr_default.stacksize_attr:=g_user_stacksize;
+  end;
+ end;
+ init_once:=1;
+end;
+
+procedure init_main_thread(thread:p_pthread);
+var
+ ret:Pointer;
+ param:sched_param;
+begin
+ thr_self(@thread^.tid);
+
+ thread^.attr:=_pthread_attr_default;
+
+ //ret:=mmap(_usrstack-_thr_guard_default-_thr_stack_initial)),
+ //            _thr_guard_default,0,$1000,-1,0); //MAP_ANON
+
+ if (ret=Pointer(-1)) then //MAP_FAILED
+ begin
+  Writeln('Cannot allocate red zone for initial thread');
+  Halt($1d1);
+ end;
+ thread^.attr.stackaddr_attr:=(_usrstack-_thr_stack_initial);
+ thread^.attr.stacksize_attr:=_thr_stack_initial;
+ thread^.attr.guardsize_attr:=_thr_guard_default;
+ thread^.attr.flags:=thread^.attr.flags or THR_STACK_USER;
+
+ thread^.magic:=THR_MAGIC;
+
+ thread^.cancel_enable:=1;
+ thread^.cancel_async:=0;
+
+ TAILQ_INIT(@thread^.mutexq);
+ TAILQ_INIT(@thread^.pp_mutexq);
+
+ thread^.state:=PS_RUNNING;
+
+ //_thr_getscheduler(thread^.tid,@thread^.attr.sched_policy,@param);
+
+ thread^.attr.prio:=param.sched_priority;
+ thread^.unwind_stackend:=_usrstack;
+end;
+
+procedure _libpthread_init(curthread:p_pthread);
+var
+ first:Integer;
+begin
+ if (_thr_initial<>nil) and (curthread=nil) then Exit;
+
+ init_private;
+
+ first:=0;
+
+ if (curthread=nil) then
+ begin
+  //curthread:=_thr_alloc(nil);
+  if (curthread=nil) then
+  begin
+   Writeln('Can''t allocate initial thread');
+   Halt($19c);
+  end;
+  init_main_thread(curthread);
+  first:=1;
+ end;
+
+ THR_LIST_ADD(curthread);
+ _thread_active_threads:=1;
+
+ if (first<>0) then
+ begin
+  _thr_initial:=curthread;
+  _tcb_set(curthread^.tcb);
+ end;
+end;
+
+
 end.
 
 

kernel/libthr/thr_private.pas

@@ -172,7 +172,12 @@ type
   private_2        :QWORD;
  end;
 
- td_event_msg_t=array[0..5] of DWORD;
+ td_event_msg_t=packed record
+  event :DWORD;
+  _align:Integer;
+  th_p  :QWORD;
+  data  :QWORD;
+ end;
 
  p_pthread_specific_elem=^pthread_specific_elem;
  pthread_specific_elem=packed record

kernel/libthr/thr_umtx.pas

@@ -217,12 +217,12 @@ end;
 
 ////
 
-procedure _thr_umutex_init(mtx:p_umutex); inline;
+procedure _thr_umutex_init(mtx:p_umutex);
 begin
  mtx^:=DEFAULT_UMUTEX;
 end;
 
-procedure _thr_urwlock_init(rwl:p_urwlock); inline;
+procedure _thr_urwlock_init(rwl:p_urwlock);
 begin
  rwl^:=DEFAULT_URWLOCK;
 end;