Changeset 30767

Timestamp:

Mar 27, 2008, 2:06:23 PM (16 years ago)

Author:

neteler

Message:

MINGW32 fixed backported

Location:

grass/branches/releasebranch_6_3/raster/r.terraflow

Files:

• IOStream/include/ami_stream.h (modified) (2 diffs)
• IOStream/include/quicksort.h (modified) (1 diff)
• IOStream/include/rtimer.h (modified) (4 diffs)
• IOStream/lib/src/ami_stream.cc (modified) (1 diff)
• IOStream/lib/src/mm_utils.cc (modified) (1 diff)
• IOStream/lib/src/rtimer.cc (modified) (1 diff)
• common.cc (modified) (1 diff)
• flow.cc (modified) (1 diff)
• grass2str.h (modified) (4 diffs)
• main.cc (modified) (7 diffs)
• stats.cc (modified) (4 diffs)

grass/branches/releasebranch_6_3/raster/r.terraflow/IOStream/include/ami_stream.h

@@ -37 +37 @@
 #include "mm.h" // Get the memory manager.
 
+#ifdef __MINGW32__
+#define getpagesize() (4096)
+#endif
+
 #define DEBUG_DELETE if(0)
 
@@ -422 +426 @@
   // Get rid of the file if not persistent and if not substream.
   if ((per != PERSIST_PERSISTENT) && (substream_level == 0)) {
-    if (unlink(path) == -1) {
+    if (remove(path) == -1) {
       cerr << "AMI_STREAM: failed to unlink " << path << endl;
       perror("cannot unlink ");

grass/branches/releasebranch_6_3/raster/r.terraflow/IOStream/include/quicksort.h

@@ -42 +42 @@
     // Try to get a good partition value and avoid being bitten by already
     // sorted input.
+#ifdef __MINGW32__
+    ptpart = data + (rand() % n);
+#else
     ptpart = data + (random() % n);
+#endif
     tpart = *ptpart;
     *ptpart = data[0];

grass/branches/releasebranch_6_3/raster/r.terraflow/IOStream/include/rtimer.h

@@ -22 +22 @@
 
 /* $Id$ */
+
+#ifdef __MINGW32__
+
+#include <time.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+
+typedef struct {
+  time_t tv1, tv2;
+} Rtimer;
+
+#define rt_start(rt)                            \
+  if((time(&(rt.tv1)) == ((time_t) -1))) {      \
+        perror("time");                         \
+        exit(1);                                \
+  }
+
+/* doesn't really stop, just updates endtimes */
+#define rt_stop(rt)                                                             \
+  if((time(&(rt.tv2)) == ((time_t) -1))) {      \
+        perror("time");                         \
+        exit(1);                                \
+  }
+
+#define rt_u_useconds(rt)       rt_w_useconds(rt)
+
+#define rt_s_useconds(rt)       rt_w_useconds(rt)
+
+#define rt_w_useconds(rt)       (1.0e6 * (rt.tv2 - rt.tv1))
+
+#else /* __MINGW32__ */
 
 #include <sys/time.h>
@@ -49 +81 @@
         exit(1);                                                                \
   }
-
-/* not required to be called, but makes values print as 0. 
-   obviously a hack */
-#define rt_zero(rt) bzero(&(rt),sizeof(Rtimer));
         
 
@@ -73 +101 @@
                  (double)rt.tv1.tv_sec*1000000))
 
+#endif /* __MINGW32__ */
+
+/* not required to be called, but makes values print as 0. 
+   obviously a hack */
+#define rt_zero(rt) bzero(&(rt),sizeof(Rtimer));
+
 #define rt_seconds(rt) (rt_w_useconds(rt)/1000000)
 
@@ -79 +113 @@
 char * rt_sprint_safe(char *buf, Rtimer rt);
 
-
-
 #endif /* RTIMER_H */

grass/branches/releasebranch_6_3/raster/r.terraflow/IOStream/lib/src/ami_stream.cc

@@ -43 +43 @@
 
   sprintf(tmp_path, "%s/%s_XXXXXX", base_dir, base);
+#ifdef __MINGW32__
+  fd = mktemp(tmp_path) ? open(tmp_path, O_CREAT|O_EXCL|O_RDWR, 0600) : -1;
+#else
   fd  = mkstemp(tmp_path);
+#endif
 
   if (fd == -1) {

grass/branches/releasebranch_6_3/raster/r.terraflow/IOStream/lib/src/mm_utils.cc

@@ -18 +18 @@
 
 #include <sys/types.h>
-#include <sys/mman.h>
 #include <ctype.h>
 

grass/branches/releasebranch_6_3/raster/r.terraflow/IOStream/lib/src/rtimer.cc

@@ -19 +19 @@
 
 #include <sys/time.h>
-#include <sys/resource.h>
 #include <stdio.h>
 #include <string.h>

grass/branches/releasebranch_6_3/raster/r.terraflow/common.cc

@@ -19 +19 @@
 
 #include <sys/types.h>
+#ifdef USE_LARGEMEM
 #include <sys/mman.h>
+#endif
 #include <ctype.h>
 

grass/branches/releasebranch_6_3/raster/r.terraflow/flow.cc

@@ -65 +65 @@
       exit(1);
     }
+#ifdef __MINGW32__
+    strcpy(buf, ctime(&t));
+#else
     ctime_r(&t, buf);
     buf[24] = '\0';
+#endif
     stats->timestamp(buf);
     *stats << endl;  

grass/branches/releasebranch_6_3/raster/r.terraflow/grass2str.h

@@ -58 +58 @@
   mapset = G_find_cell (cellname, "");
   if (mapset == NULL)
-    G_fatal_error ("cell file [%s] not found", cellname);
+    G_fatal_error (_("Raster map <%s> not found"), cellname);
   
   /* open map */
   int infd;
   if ( (infd = G_open_cell_old (cellname, mapset)) < 0)
-    G_fatal_error ("Cannot open raster map [%s]", cellname);
+    G_fatal_error (_("Unable to open raster map <%s>"), cellname);
   
   /* determine map type (CELL/FCELL/DCELL) */
@@ -83 +83 @@
         /* read input map */
     if (G_get_raster_row (infd, inrast, i, data_type) < 0)
-      G_fatal_error ("Could not read from <%s>, row=%d",cellname,i);
+      G_fatal_error (_("Unable to read raster map <%s>, row %d"),cellname, i);
   
         for (int j=0; j<ncols; j++) {
@@ -110 +110 @@
                 break;
           default:
-                G_fatal_error("raster type not implemented");           
+                G_fatal_error("Raster type not implemented");           
       }
           /* cout << form("(i=%d,j=%d): (%d, %f)\n",i,j,x,d); cout.flush(); */
@@ -176 +176 @@
   int outfd;
   if ( (outfd = G_open_raster_new (cellname, mtype)) < 0) {
-    G_fatal_error ("Could not open <%s>", cellname);
+    G_fatal_error (_("Unable to create raster map <%s>"), cellname);
   }
   

grass/branches/releasebranch_6_3/raster/r.terraflow/main.cc

@@ -15 +15 @@
  *  GNU General Public License for more details.
  *
+ *  TODO before GRASS 7 released: change param 'STREAM_DIR' -> 'stream_dir'
  *****************************************************************************/
  
@@ -225 +226 @@
   mapset = G_find_cell(cellname, "");
   if (mapset == NULL) {
-    G_fatal_error(_("cell file [%s] not found"), cellname);
+    G_fatal_error(_("Raster map <%s> not found"), cellname);
   }
   /* read cell header */
@@ -284 +285 @@
   /* check if filled elevation grid name is  valid */
   if (G_legal_filename (opt->filled_grid) < 0) {
-    G_fatal_error(_("[%s] is an illegal name"), opt->filled_grid);
+    G_fatal_error(_("<%s> is an illegal file name"), opt->filled_grid);
   }
   /* check if output grid names are valid */
   if (G_legal_filename (opt->dir_grid) < 0) {
-    G_fatal_error(_("[%s] is an illegal name"), opt->dir_grid);
+    G_fatal_error(_("<%s> is an illegal file name"), opt->dir_grid);
   }
   if (G_legal_filename (opt->filled_grid) < 0) {
-    G_fatal_error(_("[%s] is an illegal name"), opt->filled_grid);
+    G_fatal_error(_("<%s> is an illegal file name"), opt->filled_grid);
   }
   if (G_legal_filename (opt->flowaccu_grid) < 0) {
-    G_fatal_error(_("[%s] is an illegal name"), opt->flowaccu_grid);
+    G_fatal_error(_("<%s> is an illegal file name"), opt->flowaccu_grid);
   }
   if (G_legal_filename (opt->watershed_grid) < 0) {
-    G_fatal_error(_("[%s] is an illegal name"), opt->watershed_grid);
+    G_fatal_error(_("<%s> is an illegal file name"), opt->watershed_grid);
   }
 #ifdef OUTPU_TCI
   if (G_legal_filename (opt->tci_grid) < 0) {
-  G_fatal_error(_("[%s] is an illegal name"), opt->tci_grid);
+  G_fatal_error(_("<%s> is an illegal file name"), opt->tci_grid);
   }
 #endif
@@ -325 +326 @@
   }
 
+#ifdef __MINGW32__
+  strcpy(buf, ctime(&t));
+#else
   ctime_r(&t, buf);
   buf[24] = '\0';
+#endif
   stats->timestamp(buf);
   
@@ -370 +375 @@
   mapset = G_find_cell(cellname, "");
   if (mapset == NULL) {
-    G_fatal_error (_("cell file [%s] not found"), cellname);
+    G_fatal_error (_("Raster map <%s> not found"), cellname);
   }
   if (G_read_range(cellname, mapset, &r) == -1) {
@@ -410 +415 @@
   mapset = G_find_cell(cellname, "");
   if (mapset == NULL) {
-    G_fatal_error (_("cell file [%s] not found"), cellname);
+    G_fatal_error (_("Raster map <%s> not found"), cellname);
   }
   if (G_read_range(cellname, mapset, &r) == -1) {
@@ -520 +525 @@
   /* check STREAM path (the place where intermediate STREAMs are placed) */
   sprintf(buf, "%s=%s",STREAM_TMPDIR, opt->streamdir);
-  putenv(buf);
+  /* don't pass an automatic variable; putenv() isn't guaranteed to make a copy */
+  putenv(G_store(buf));
   if (getenv(STREAM_TMPDIR) == NULL) {
     fprintf(stderr, "%s:", STREAM_TMPDIR);

grass/branches/releasebranch_6_3/raster/r.terraflow/stats.cc

@@ -22 +22 @@
 #include <sys/types.h>
 #include <sys/time.h>
+#ifndef __MINGW32__
 #include <sys/resource.h>
+#endif
 #include <stdio.h>
 #include <errno.h>
@@ -127 +129 @@
   //closes fd and returns the name;
   rt_start(tm);
+#ifndef __MINGW32__
   bss = sbrk(0);
+#endif
   char buf[BUFSIZ];
   *this << freeMem(buf) << endl;
@@ -136 +140 @@
 long 
 statsRecorder::freeMem() {
+#ifdef __MINGW32__
+  return -1;
+#else
   struct rlimit rlim;
   if (getrlimit(RLIMIT_DATA, &rlim) == -1) {
@@ -149 +156 @@
   long freeMem = rlim.rlim_cur - ((char*)sbrk(0)-(char*)bss);
   return freeMem;
+#endif /* __MINGW32__ */
 }