LEMON/LEMON-main Changeset - r491:879c55700cd4

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r491:879c55700cd4

« 484:daddd6

498:afd134 »
493:3f0ddf »
492:b9b347 »

r491:879c55700cd4

Mon, 16 Feb 2009 16:03:32

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Wrap around the usages of windows.h

0 5 2

default

7 files changed with 186 insertions and 68 deletions:

lemon/bits/windows.cc

136

lemon/bits/windows.h

lemon/CMakeLists.txt

lemon/Makefile.am

lemon/graph_to_eps.h

lemon/random.h

lemon/time_measure.h

↑ Collapse diff ↑

lemon/bits/windows.cc

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		///\file
 		///\brief Some basic non-inline functions and static global data.
 		#include<lemon/bits/windows.h>
 		#ifdef WIN32
 		#ifndef WIN32_LEAN_AND_MEAN
 		#define WIN32_LEAN_AND_MEAN
 		#endif
 		#ifndef NOMINMAX
 		#define NOMINMAX
 		#endif
 		#include <windows.h>
 		#else
 		#include <unistd.h>
 		#include <ctime>
 		#include <sys/times.h>
 		#include <sys/time.h>
 		#endif
 		#include <cmath>
 		#include <sstream>
 		namespace lemon {
 		  namespace bits {
 		    void getWinProcTimes(double &rtime,
 		                         double &utime, double &stime,
 		                         double &cutime, double &cstime)
+		    {
 		#ifdef WIN32
 		      static const double ch = 4294967296.0e-7;
 		      static const double cl = 1.0e-7;
 		      FILETIME system;
 		      GetSystemTimeAsFileTime(&system);
 		      rtime = ch * system.dwHighDateTime + cl * system.dwLowDateTime;
 		      FILETIME create, exit, kernel, user;
 		      if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
 		        utime = ch * user.dwHighDateTime + cl * user.dwLowDateTime;
 		        stime = ch * kernel.dwHighDateTime + cl * kernel.dwLowDateTime;
 		        cutime = 0;
 		        cstime = 0;
 		      } else {
 		        rtime = 0;
 		        utime = 0;
 		        stime = 0;
 		        cutime = 0;
 		        cstime = 0;
+		      }
 		#else
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      rtime=tv.tv_sec+double(tv.tv_usec)/1e6;
 		      tms ts;
 		      double tck=sysconf(_SC_CLK_TCK);
 		      times(&ts);
 		      utime=ts.tms_utime/tck;
 		      stime=ts.tms_stime/tck;
 		      cutime=ts.tms_cutime/tck;
 		      cstime=ts.tms_cstime/tck;
 		#endif
+		    }
 		    std::string getWinFormattedDate()
+		    {
 		      std::ostringstream os;
 		#ifdef WIN32
 		      SYSTEMTIME time;
 		      GetSystemTime(&time);
 		#if defined(_MSC_VER) && (_MSC_VER < 1500)
 		      LPWSTR buf1, buf2, buf3;
 		      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        L"ddd MMM dd", buf1, 11) &&
 		          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        L"HH':'mm':'ss", buf2, 9) &&
 		          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        L"yyyy", buf3, 5)) {
 		        os << buf1 << ' ' << buf2 << ' ' << buf3;
+		      }
 		#else
 		      char buf1[11], buf2[9], buf3[5];
 		      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        "ddd MMM dd", buf1, 11) &&
 		          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        "HH':'mm':'ss", buf2, 9) &&
 		          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        "yyyy", buf3, 5)) {
 		        os << buf1 << ' ' << buf2 << ' ' << buf3;
+		      }
 		#endif
 		      else os << "unknown";
 		#else
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      char cbuf[26];
 		      ctime_r(&tv.tv_sec,cbuf);
 		      os << cbuf;
 		#endif
 		      return os.str();
+		    }
 		    int getWinRndSeed()
+		    {
 		#ifdef WIN32
 		      FILETIME time;
 		      GetSystemTimeAsFileTime(&time);
 		      return GetCurrentProcessId() + time.dwHighDateTime + time.dwLowDateTime;
 		#else
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      return getpid() + tv.tv_sec + tv.tv_usec;
 		#endif
+		    }
+		  }
+		}

lemon/bits/windows.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_WINDOWS_H
 		#define LEMON_WINDOWS_H
 		#include <string>
 		namespace lemon {
 		  namespace bits {
 		    void getWinProcTimes(double &rtime,
 		                         double &utime, double &stime,
 		                         double &cutime, double &cstime);
 		    std::string getWinFormattedDate();
 		    int getWinRndSeed();
+		  }
+		}
 		#endif

lemon/CMakeLists.txt

Show inline comments

 		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 		ADD_LIBRARY(lemon
 		  arg_parser.cc
 		  base.cc
 		  color.cc
-		  random.cc)
 		  random.cc
 		  bits/windows.cc
+		)
 		INSTALL(
 		  TARGETS lemon
 		  ARCHIVE DESTINATION lib
 		  COMPONENT library)

lemon/Makefile.am

Show inline comments

@@ -7,13 +7,14 @@
 		lib_LTLIBRARIES += lemon/libemon.la
 		lemon_libemon_la_SOURCES = \
 		        lemon/arg_parser.cc \
 		        lemon/base.cc \
 		        lemon/color.cc \
 		        lemon/random.cc
+		        lemon/random.cc \
 			lemon/bits/windows.cc
 		#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
 		#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
 		lemon_HEADERS += \
 		        lemon/arg_parser.h \
@@ -37,13 +38,14 @@
 			lemon/math.h \
 			lemon/path.h \
 		        lemon/random.h \
 			lemon/smart_graph.h \
 		        lemon/time_measure.h \
 		        lemon/tolerance.h \
 			lemon/unionfind.h
+			lemon/unionfind.h \
 			lemon/bits/windows.h
 		bits_HEADERS += \
 			lemon/bits/alteration_notifier.h \
 			lemon/bits/array_map.h \
 			lemon/bits/base_extender.h \
 		        lemon/bits/bezier.h \

lemon/graph_to_eps.h

Show inline comments

@@ -26,19 +26,13 @@
 		#include<vector>
 		#ifndef WIN32
 		#include<sys/time.h>
 		#include<ctime>
 		#else
 		#ifndef WIN32_LEAN_AND_MEAN
 		#define WIN32_LEAN_AND_MEAN
 		#endif
 		#ifndef NOMINMAX
 		#define NOMINMAX
 		#endif
 		#include<windows.h>
+		#include<lemon/bits/windows.h>
 		#endif
 		#include<lemon/math.h>
 		#include<lemon/core.h>
 		#include<lemon/dim2.h>
 		#include<lemon/maps.h>
@@ -680,47 +674,25 @@
 		    os << "%!PS-Adobe-2.0 EPSF-2.0\n";
 		    if(_title.size()>0) os << "%%Title: " << _title << '\n';
 		     if(_copyright.size()>0) os << "%%Copyright: " << _copyright << '\n';
 		    os << "%%Creator: LEMON, graphToEps()\n";
+		    {
 		      os << "%%CreationDate: ";
 		#ifndef WIN32
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      char cbuf[26];
 		      ctime_r(&tv.tv_sec,cbuf);
-		      os << "%%CreationDate: " << cbuf;
 		      os << cbuf;
 		#else
 		      SYSTEMTIME time;
 		      GetSystemTime(&time);
 		#if defined(_MSC_VER) && (_MSC_VER < 1500)
 		      LPWSTR buf1, buf2, buf3;
 		      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        L"ddd MMM dd", buf1, 11) &&
 		          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        L"HH':'mm':'ss", buf2, 9) &&
 		          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        L"yyyy", buf3, 5)) {
 		        os << "%%CreationDate: " << buf1 << ' '
 		           << buf2 << ' ' << buf3 << std::endl;
+		      }
 		#else
 		        char buf1[11], buf2[9], buf3[5];
 		        if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                          "ddd MMM dd", buf1, 11) &&
 		            GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                          "HH':'mm':'ss", buf2, 9) &&
 		            GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                          "yyyy", buf3, 5)) {
 		          os << "%%CreationDate: " << buf1 << ' '
 		             << buf2 << ' ' << buf3 << std::endl;
+		        }
-		#endif
+		      os << bits::getWinFormattedDate();
 		#endif
+		    }
 		    os << std::endl;
 		    if (_autoArcWidthScale) {
 		      double max_w=0;
 		      for(ArcIt e(g);e!=INVALID;++e)
 		        max_w=std::max(double(_arcWidths[e]),max_w);
 		      if(max_w>EPSILON) {

lemon/random.h

Show inline comments

@@ -74,13 +74,13 @@
 		#ifndef WIN32
 		#include <sys/time.h>
 		#include <ctime>
 		#include <sys/types.h>
 		#include <unistd.h>
 		#else
 		#include <windows.h>
+		#include <lemon/bits/windows.h>
 		#endif
 		///\ingroup misc
 		///\file
 		///\brief Mersenne Twister random number generator
@@ -663,15 +663,13 @@
 		    bool seedFromTime() {
 		#ifndef WIN32
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      seed(getpid() + tv.tv_sec + tv.tv_usec);
 		#else
 		      FILETIME time;
 		      GetSystemTimeAsFileTime(&time);
-		      seed(GetCurrentProcessId() + time.dwHighDateTime + time.dwLowDateTime);
+		      seed(bits::getWinRndSeed());
 		#endif
 		      return true;
+		    }
 		    /// @}

lemon/time_measure.h

Show inline comments

@@ -21,20 +21,13 @@
 		///\ingroup timecount
 		///\file
 		///\brief Tools for measuring cpu usage
 		#ifdef WIN32
 		#ifndef WIN32_LEAN_AND_MEAN
 		#define WIN32_LEAN_AND_MEAN
 		#endif
 		#ifndef NOMINMAX
 		#define NOMINMAX
 		#endif
 		#include <windows.h>
 		#include <cmath>
 		#include <lemon/bits/windows.h>
 		#else
 		#include <unistd.h>
 		#include <sys/times.h>
 		#include <sys/time.h>
 		#endif
@@ -89,32 +82,13 @@
 		      times(&ts);
 		      utime=ts.tms_utime/tck;
 		      stime=ts.tms_stime/tck;
 		      cutime=ts.tms_cutime/tck;
 		      cstime=ts.tms_cstime/tck;
 		#else
 		      static const double ch = 4294967296.0e-7;
 		      static const double cl = 1.0e-7;
 		      FILETIME system;
 		      GetSystemTimeAsFileTime(&system);
 		      rtime = ch * system.dwHighDateTime + cl * system.dwLowDateTime;
 		      FILETIME create, exit, kernel, user;
 		      if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
 		        utime = ch * user.dwHighDateTime + cl * user.dwLowDateTime;
 		        stime = ch * kernel.dwHighDateTime + cl * kernel.dwLowDateTime;
 		        cutime = 0;
 		        cstime = 0;
 		      } else {
 		        rtime = 0;
 		        utime = 0;
 		        stime = 0;
 		        cutime = 0;
 		        cstime = 0;
+		      }
 		      bits::getWinProcTimes(rtime, utime, stime, cutime, cstime);
 		#endif
+		    }
 		    /// Constructor initializing with zero
 		    TimeStamp()
 		    { _reset(); }

0 comments (0 inline)

RhodeCode

Login to your account