Changeset 2035:e92071fadd3f in lemon-0.x

Timestamp:

04/03/06 21:47:37 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2674

Message:

More mingw compatibility

Implementation of the drand48 functions

Location:

lemon

Files:

• Makefile.am (modified) (2 diffs)
• bits/mingw32_rand.cc (added)
• bits/mingw32_rand.h (added)
• bits/mingw32_time.cc (added)
• bits/mingw32_time.h (modified) (2 diffs)
• simann.h (modified) (1 diff)

lemon/Makefile.am

@@ -10 +10 @@
         lp_skeleton.cc \
         base.cc \
-        eps.cc 
+        eps.cc \
+        bits/mingw32_rand.cc \
+        bits/mingw32_time.cc
+
 libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
 libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
@@ -100 +103 @@
         bits/traits.h \
         bits/utility.h \
+        bits/mingw32_rand.h \
+        bits/mingw32_time.h \
         concept/bpugraph.h \
         concept/graph.h \

lemon/bits/mingw32_time.h

@@ -23 +23 @@
 
 #include <windows.h>
-#include <time.h>
+#include <ctime>
 #include "dos.h"
 
-static const char days[] = 
-"Sun Mon Tue Wed Thu Fri Sat ";
-static const char months[] = 
-"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ";
-
-inline void num2str(char *c,int i) {
-  c[0]=i/10+'0';
-  c[1]=i%10+'0';
-}
-
-inline char *asctime_r(const struct tm *t, char *buf) {
-  /* "Wed Jun 30 21:49:08 1993\n" */
-  *(int*)buf=*(int*)(days+(t->tm_wday<<2));
-  *(int*)(buf+4)=*(int*)(months+(t->tm_mon<<2));
-  num2str(buf+8,t->tm_mday);
-  if (buf[8]=='0') buf[8]=' ';
-  buf[10]=' ';
-  num2str(buf+11,t->tm_hour);
-  buf[13]=':';
-  num2str(buf+14,t->tm_min);
-  buf[16]=':';
-  num2str(buf+17,t->tm_sec);
-  buf[19]=' ';
-  num2str(buf+20,(t->tm_year+1900)/100);
-  num2str(buf+22,(t->tm_year+1900)%100);
-  buf[24]='\n'; buf[25]='\0';
-  return buf;
-}
-
-inline struct tm * localtime_r (const time_t *t, struct tm *tm) {
-  struct tm *tmp;
-  
-  if ((tmp = localtime(t)) && tm)
-    *tm = *tmp;
-  else
-    return 0;
-  
-  return tm;
-}
-
-inline char *ctime_r(const time_t * tim_p , char * result) {
-  struct tm tm;
-  return asctime_r (localtime_r (tim_p, &tm), result);
-}
-
-
-inline int gettimeofday(struct timeval * tp, struct timezone *) {
-  SYSTEMTIME systime;
-
-  if (tp) {
-    struct tm tmrec;
-    time_t theTime = time(NULL);
-    
-    
-    tmrec = *localtime(&theTime);
-    tp->tv_sec = mktime(&tmrec);
-    GetLocalTime(&systime); /* system time */
-
-    tp->tv_usec = systime.wMilliseconds * 1000;
-  }
-  return 0;
-}
-
+char *asctime_r(const struct tm *t, char *buf);
+struct tm * localtime_r (const time_t *t, struct tm *tm);
+char *ctime_r(const time_t * tim_p , char * result);
+int gettimeofday(struct timeval * tp, struct timezone *);
 
 struct tms {
@@ -97 +38 @@
 };
 
-inline long filetime_to_clock(FILETIME *ft)
-{
-  __int64 qw = ft->dwHighDateTime;
-  qw <<= 32;
-  qw |= ft->dwLowDateTime;
-  qw /= 10000;  /* File time ticks at 0.1uS, clock at 1mS */
-  return (long) qw;
+long filetime_to_clock(FILETIME *ft);
 
-}
-
-inline int times(struct tms *tmbuf)
-{
-  FILETIME create, exit, kernel, user;
-  if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
-    tmbuf->tms_utime = filetime_to_clock(&user);
-    tmbuf->tms_stime = filetime_to_clock(&kernel);
-    tmbuf->tms_cutime = 0;
-    tmbuf->tms_cstime = 0;
-  }
-  else {
-    tmbuf->tms_utime = clock();
-    tmbuf->tms_stime = 0;
-    tmbuf->tms_cutime = 0;
-    tmbuf->tms_cstime = 0;
-  }
-  return 0;
-}
+int times(struct tms *tmbuf);
 
 #define _SC_CLK_TCK 1
 
-inline int sysconf(int)
-{
-  return 1;
-}
+int sysconf(int);
 
 #endif
 
-
 #endif

lemon/simann.h

@@ -32 +32 @@
 #include <limits>
 #include <lemon/time_measure.h>
+
+#ifdef WIN32
+#include <lemon/bits/mingw32_rand.h>
+#endif
 
 namespace lemon {