Changeset 65591

Timestamp:

Jul 14, 2015, 8:18:21 PM (9 years ago)

Author:

glynn

Message:

Prevent concurrent raster reads when a mask is present

File:

• grass/trunk/raster/r.mapcalc/map.c (modified) (8 diffs)

grass/trunk/raster/r.mapcalc/map.c

@@ -72 +72 @@
 static int num_maps;
 static int max_maps;
+static int masking;
 
 static int min_row = INT_MAX;
@@ -82 +83 @@
 #ifdef HAVE_PTHREAD_H
 static pthread_mutex_t cats_mutex;
-#endif
-
-/****************************************************************************/
+static pthread_mutex_t mask_mutex;
+#endif
+
+/****************************************************************************/
+
+static void read_row(int fd, void *buf, int row, int res_type)
+{
+#ifdef HAVE_PTHREAD_H
+    if (masking)
+        pthread_mutex_lock(&mask_mutex);
+#endif
+    Rast_get_row(fd, buf, row, res_type);
+#ifdef HAVE_PTHREAD_H
+    if (masking)
+        pthread_mutex_unlock(&mask_mutex);
+#endif
+}
 
 static void cache_sub_init(struct row_cache *cache, int data_type)
@@ -146 +161 @@
     if (i >= 0 && i < cache->nrows) {
         if (!sub->valid[i]) {
-            Rast_get_row(cache->fd, sub->buf[i], row + i, data_type);
+            read_row(cache->fd, sub->buf[i], row + i, data_type);
             sub->valid[i] = 1;
         }
@@ -155 +170 @@
         memset(sub->valid, 0, cache->nrows);
         sub->row = i;
-        Rast_get_row(cache->fd, sub->buf[0], row, data_type);
+        read_row(cache->fd, sub->buf[0], row, data_type);
         sub->valid[0] = 1;
         return sub->buf[0];
@@ -183 +198 @@
     G_freea(vtmp);
 
-    Rast_get_row(cache->fd, sub->buf[i], row, data_type);
+    read_row(cache->fd, sub->buf[i], row, data_type);
     sub->valid[i] = 1;
 
@@ -366 +381 @@
 }
 
-static void read_row(int fd, void *buf, int row, int res_type)
-{
-    Rast_get_row(fd, buf, row, res_type);
-}
-
 static void setup_map(struct map *m)
 {
@@ -577 +587 @@
 #ifdef HAVE_PTHREAD_H
     pthread_mutex_init(&cats_mutex, NULL);
+    pthread_mutex_init(&mask_mutex, NULL);
+    masking = Rast_maskfd() >= 0;
 #endif
 
@@ -636 +648 @@
 #ifdef HAVE_PTHREAD_H
     pthread_mutex_destroy(&cats_mutex);
+    pthread_mutex_destroy(&mask_mutex);
 #endif
 }