win build...?

Author: moon-chilled

jsrc/cd.c

@@ -3,23 +3,15 @@
 /*                                                                         */
 // emulation of Unix functions on Windows
 #ifdef _WIN32
-struct timezone {
-    int tz_minuteswest;
-    int tz_dsttime;
-};
-
 // Tip o'hat to Michaelangel007 on StackOverflow
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <stdint.h> // portable: uint64_t   MSVC: __int64 
 
-// MSVC defines this in winsock2.h!?
-typedef struct timeval {
-    long tv_sec;
-    long tv_usec;
-} timeval;
+struct jtimeval { long tv_sec, tv_usec; };
+struct jtimezone { int tz_minuteswest, tz_dsttime; };
 
-extern int gettimeofday(struct timeval * tp, struct timezone * tzp)
+int jgettimeofday(struct jtimeval *tp, struct jtimezone * tzp)
 {
     // Note: some broken versions only have 8 trailing zero's, the correct epoch has 9 trailing zero's
     // This magic number is the number of 100 nanosecond intervals since January 1, 1601 (UTC)
@@ -40,4 +32,3 @@ extern int gettimeofday(struct timeval * tp, struct timezone * tzp)
     return 0;
 }
 #endif
-

jsrc/ct.c

@@ -14,23 +14,6 @@ NOINLINE I johnson(I n){I johnson=0x1234; if(n<0)R n; do{johnson ^= (johnson<<1)
 //36ns TUNE; ~60clk on zen, ~160clk on intel; consider adding more general uarch tuning capabilities (eg for cache size)
 //7ns mispredict penalty (15-20clk) + mul latency (3clk)
 
-#if SY_WIN32
-struct timezone {
-    int tz_minuteswest;
-    int tz_dsttime;
-};
-
-// Tip o'hat to Michaelangel007 on StackOverflow
-// MSVC defines this in winsock2.h!?
-typedef struct timeval {
-    long tv_sec;
-    long tv_usec;
-} timeval;
-extern int gettimeofday(struct timeval * tp, struct timezone * tzp);
-#else
-#include <sys/time.h>
-#endif
-
 // Extend a hashtable/data table under lock.  abuf is the pointer to the block to be extended (*abuf will hold the new block address).
 // *alock is the lock to use.  We hold a writelock on *alock on entry, but we may relinquish inside this routine.
 // On exit we hold the write lock UNLESS there was an error, in which case we return NOT holding the lock (to allow the caller to abort on error)
@@ -241,8 +224,8 @@ A jtpyxval(J jt,A pyx){A res; C errcode;
   if(unlikely(maxtime<tod())){errcode=EVTIME; break;}  // timeout: fail the pyx and exit
   pthread_mutex_lock(&((PYXBLOK*)AAV0(pyx))->pyxwb.mutex);
   if((res=__atomic_load_n(&((PYXBLOK*)AAV0(pyx))->pyxvalue,__ATOMIC_ACQUIRE))==0&&(errcode=__atomic_load_n(&((PYXBLOK*)AAV0(pyx))->errcode,__ATOMIC_ACQUIRE))==0){
-   struct timeval nowtime;
-   gettimeofday(&nowtime,0);  // system time now
+   struct jtimeval nowtime;
+   jgettimeofday(&nowtime,0);  // system time now
    I tousec=nowtime.tv_usec+200000;
    struct timespec endtime={nowtime.tv_usec+(tousec>=1000000),tousec-1000000*(tousec>=1000000)};  // system time when we give up.  The struct says it uses nsec but it seems to use usec
    pthread_cond_timedwait(&((PYXBLOK*)AAV0(pyx))->pyxwb.cond,&((PYXBLOK*)AAV0(pyx))->pyxwb.mutex,&endtime);

jsrc/j.h

@@ -405,6 +405,17 @@ extern unsigned int __cdecl _clearfp (void);
 #endif
 #endif
 
+#if SY_WIN32
+struct jtimeval { long tv_sec, tv_usec; };
+struct jtimezone { int tz_minuteswest, tz_dsttime; };
+int jgettimeofday(struct jtimeval*, struct jtimezone*);
+#else
+#include <sys/time.h>
+#define jtimeval timeval
+#define jtimezone timezone
+#define jgettimeofday gettimeofday
+#endif
+
 #if SY_64
 #if defined(MMSC_VER)  // SY_WIN32
 // RESTRICTI (for in-place) is used for things like *z++=*x++ - *y++;  Normally you wouldn't store to a z unless you were done reading
@@ -2256,4 +2267,3 @@ extern uint32_t crc32csb4(uint32_t crc, uint32_t value);
 #endif
 #define CRC32LL CRC32L                 // takes UIL (8 bytes), return UI
 #endif
-

jsrc/mt.h

@@ -19,11 +19,7 @@ static inline C jtpthread_mutex_lock(J jt,jtpthread_mutex_t *m,I self){
  R EVFACE;}
 static inline I jtpthread_mutex_timedlock(J jt,jtpthread_mutex_t *m,UI ns,I self){
 #if SY_WIN32
- // Tip o'hat to Michaelangel007 on StackOverflow
- // MSVC defines this in winsock2.h!?
- struct timeval { long tv_sec; long tv_usec; }; struct timezone;
- extern int gettimeofday(struct timeval * tp, struct timezone * tzp);
- struct timeval now;gettimeofday(&now,0);
+ struct jtimeval now;jgettimeofday(&now,0);
  struct timespec t;
  t.tv_sec=now.tv_sec+ns/1000000000;t.tv_nsec=1000*now.tv_usec+ns%1000000000;if(t.tv_nsec>=1000000000){t.tv_sec++;t.tv_nsec-=1000000000;}
 #else