fix tests, interfaces

Author: moon-chilled

jsrc/ct.c

@@ -751,12 +751,12 @@ ASSERT(0,EVNONCE)
    C c=jtpthread_mutex_lock(jt,(jtpthread_mutex_t*)IAV0(mutex),1+THREADID(jt));ASSERT(!c,c); //1+ is to ensure nonzero id.  TODO id should be unique per-task, not just per-thread
   }else if(timeout==0.0){
    I lockrc=jtpthread_mutex_trylock((jtpthread_mutex_t*)IAV0(mutex),1+THREADID(jt));
-   lockfail=lockrc==-1;  // -1 is a soft failure
    ASSERT(lockrc<=0,lockrc);  // positive is a hard failure
+   lockfail=lockrc==-1;  // -1 is a soft failure
   }else{
    I lockrc=jtpthread_mutex_timedlock(jt,(jtpthread_mutex_t*)IAV0(mutex),1e9*timeout,1+THREADID(jt));
-   lockfail=lockrc==-1;  // -1 is a soft failure
    ASSERT(lockrc<=0,lockrc);  // positive is a hard failure
+   lockfail=lockrc==-1;  // -1 is a soft failure
   }
   z=num(lockfail);
 #else

jsrc/mt.c

@@ -62,10 +62,10 @@ I jtpthread_mutex_timedlock(J jt,jtpthread_mutex_t *m,UI ns,I self){
   if(now.tv_nsec<=tgt.tv_nsec)ns+=tgt.tv_nsec-now.tv_nsec;
   else ns+=1000000000-(now.tv_nsec-tgt.tv_nsec);}
 success:m->ct+=m->recursive;m->owner=self; R 0;}
-B jtpthread_mutex_trylock(jtpthread_mutex_t *m,I self){
- if(uncommon(m->recursive)){if(m->owner!=self)R 0; m->ct++;R 1;}
- if(m->owner==self)R 0;
- if(casa(&m->v,&(UI4){FREE},LOCK)){m->owner=self;R 1;}   R 0;}
+I jtpthread_mutex_trylock(jtpthread_mutex_t *m,I self){
+ if(uncommon(m->recursive)&&m->owner){if(m->owner!=self)R -1; m->ct++;R 0;}
+ if(m->owner==self)R EVCONCURRENCY;
+ if(casa(&m->v,&(UI4){FREE},LOCK)){m->ct+=m->recursive;m->owner=self;R 0;}   R -1;}
 C jtpthread_mutex_unlock(jtpthread_mutex_t *m,I self){
  if(unlikely(m->owner!=self))R EVCONCURRENCY;
  if(uncommon(m->recursive)){if(--m->ct)R 0;} //need to be released more times on this thread

jsrc/mt.h

@@ -23,8 +23,13 @@ static inline I jtpthread_mutex_timedlock(J jt,jtpthread_mutex_t *m,UI ns,I self
  if(r==ETIMEDOUT)R -1;
  if(r==EDEADLK)R EVCONCURRENCY;
  R EVFACE;}
-static inline B jtpthread_mutex_trylock(jtpthread_mutex_t *m,I self){R !pthread_mutex_trylock(m);}
-static inline B jtpthread_mutex_unlock(jtpthread_mutex_t *m,I self){
+static inline I jtpthread_mutex_trylock(jtpthread_mutex_t *m,I self){
+ I4 r=pthread_mutex_timedlock(m);
+ if(!r)R 0;
+ if(r==ETIMEDOUT)R -1;
+ if(r==EDEADLK||r==EOWNERDEAD)R EVCONCURRENCY;
+ R EVFACE;}
+static inline C jtpthread_mutex_unlock(jtpthread_mutex_t *m,I self){
  I4 r=pthread_mutex_unlock(m);
  if(likely(!r))R 0;
  if(r==EPERM)R EVCONCURRENCY;
@@ -71,8 +76,8 @@ typedef struct {
 
 void jtpthread_mutex_init(jtpthread_mutex_t*,B recursive);
 struct JTTstruct; C jtpthread_mutex_lock(struct JTTstruct *jt,jtpthread_mutex_t *m,I self);
-I jtpthread_mutex_timedlock(struct JTTstruct *jt,jtpthread_mutex_t*,UI ns,I self); //absolute timers suck; correct the interface.  Negative result means failure; 0 is success; positive is error code
-B jtpthread_mutex_trylock(jtpthread_mutex_t*,I self); //0=failure 1=success, opposite posix
+I jtpthread_mutex_timedlock(struct JTTstruct *jt,jtpthread_mutex_t*,UI ns,I self); //absolute timers suck; correct the interface.  -1=failure; 0=success; positive=error
+I jtpthread_mutex_trylock(jtpthread_mutex_t*,I self); //0=success -1=failure positive=error
 C jtpthread_mutex_unlock(jtpthread_mutex_t*,I self); //0 or error code
 
 //note: self must be non-zero

test/gtdot.ijs

@@ -282,23 +282,23 @@ assert. remote_stuff=2
 assert. remote_stuff=4
 NB. mutex
 mtx =. 10 T. 0
-0 = 11 T. mtx;0
+0 = >{{11 T. mtx;0}}t.''0
 1 = 11 T. mtx;0
-13 T. mtx
+mtx =. 10 T. 0
 0 = 11 T. mtx
 'domain error' -: 11 T. etx >: mtx
 13 T. mtx
 mtx =. 10 T. 0
 tod =. 6!:1''
-0 = 11 T. <mtx  NB. boxed mtx OK
+0 = >{{11 T. <mtx}}t.''0  NB. boxed mtx OK
 1 = 11 T. mtx;2.0
-(2.005 > dly) *. 2 < dly =. tod-~6!:1''  NB. verify delay
+(2.005 > dly) *. 2 <: dly =. tod-~6!:1''  NB. verify delay
 tod =. 6!:1''
 1 = 11 T. mtx;0.1
-(0.105 > dly) *. 0.1 < dly =. tod-~6!:1''  NB. verify delay
+(0.105 > dly) *. 0.1 <: dly =. tod-~6!:1''  NB. verify delay
 tod =. 6!:1''
 1 = 11 T. mtx;0
-(0.005 > dly) *. 0 < dly =. tod-~6!:1''  NB. verify no delay
+(0.005 > dly) *. 0 <: dly =. tod-~6!:1''  NB. verify no delay
 13 T. mtx
 mtx=.10 T. 1  NB. recursive
 0 = 11 T. mtx