Backporting a few more minor changes (#449)

In order to reduce differences between `v0.7.x` and default branch.

Author: hummeltech

Makefile.am

@@ -5,15 +5,15 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = $(PTHREAD_CFLAGS) $(GLIB_CFLAGS)
 
 STORE_SOURCES = \
+	src/g_logger.c \
 	src/store.c \
 	src/store_file.c \
 	src/store_file_utils.c \
 	src/store_memcached.c \
+	src/store_null.c \
 	src/store_rados.c \
-	src/store_ro_http_proxy.c \
 	src/store_ro_composite.c \
-	src/store_null.c \
-	src/g_logger.c
+	src/store_ro_http_proxy.c
 STORE_LDFLAGS = $(LIBMEMCACHED_LDFLAGS) $(LIBRADOS_LDFLAGS) $(LIBCURL) $(GLIB_LIBS)
 
 STORE_CPPFLAGS =
@@ -22,8 +22,8 @@ bin_PROGRAMS = \
 	renderd \
 	render_expired \
 	render_list \
-	render_speedtest \
-	render_old
+	render_old \
+	render_speedtest
 noinst_PROGRAMS = gen_tile_test
 
 man_MANS = \
@@ -37,33 +37,33 @@ man_MANS = \
 renderddir = $(sysconfdir)
 
 renderd_SOURCES = \
-	src/daemon.c \
+	src/renderd.c \
+	src/cache_expire.c \
 	src/daemon_compat.c \
 	src/gen_tile.cpp \
-	src/sys_utils.c \
-	src/request_queue.c \
-	src/cache_expire.c \
 	src/metatile.cpp \
 	src/parameterize_style.cpp \
 	src/protocol_helper.c \
+	src/request_queue.c \
+	src/sys_utils.c \
 	$(STORE_SOURCES)
 renderd_CXXFLAGS = $(MAPNIK_CFLAGS)
-renderd_LDADD = $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(STORE_LDFLAGS) $(INIPARSER_LDFLAGS)
 renderd_DATA = etc/renderd/renderd.conf
+renderd_LDADD = $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(STORE_LDFLAGS) $(INIPARSER_LDFLAGS)
 
 render_speedtest_SOURCES = \
-	src/speedtest.cpp \
+	src/render_speedtest.cpp \
+	src/g_logger.c \
 	src/protocol_helper.c \
 	src/render_submit_queue.c \
-	src/sys_utils.c \
-	src/g_logger.c
+	src/sys_utils.c
 render_speedtest_LDADD = $(PTHREAD_CFLAGS) $(GLIB_LIBS)
 
 render_list_SOURCES = \
 	src/render_list.c \
-	src/sys_utils.c \
 	src/protocol_helper.c \
 	src/render_submit_queue.c \
+	src/sys_utils.c \
 	$(STORE_SOURCES)
 render_list_LDADD = $(PTHREAD_CFLAGS) $(STORE_LDFLAGS)
 
@@ -76,28 +76,19 @@ render_expired_SOURCES = \
 render_expired_LDADD = $(PTHREAD_CFLAGS) $(STORE_LDFLAGS)
 
 render_old_SOURCES = \
-	src/store_file_utils.c \
 	src/render_old.c \
-	src/sys_utils.c \
+	src/g_logger.c \
 	src/protocol_helper.c \
 	src/render_submit_queue.c \
-	src/g_logger.c
+	src/store_file_utils.c \
+	src/sys_utils.c
 render_old_LDADD = $(PTHREAD_CFLAGS) $(GLIB_LIBS)
 
 #convert_meta_SOURCES = src/dir_utils.c src/store.c src/convert_meta.c
 
 gen_tile_test_SOURCES = \
 	src/gen_tile_test.cpp \
-	src/metatile.cpp \
-	src/request_queue.c \
-	src/protocol_helper.c \
-	src/daemon.c \
-	src/daemon_compat.c \
-	src/gen_tile.cpp \
-	src/sys_utils.c \
-	src/cache_expire.c \
-	src/parameterize_style.cpp \
-	$(STORE_SOURCES)
+	$(renderd_SOURCES)
 gen_tile_test_CFLAGS = -DMAIN_ALREADY_DEFINED $(PTHREAD_CFLAGS) $(GLIB_CFLAGS)
 gen_tile_test_CXXFLAGS = $(MAPNIK_CFLAGS)
 gen_tile_test_LDADD = $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(STORE_LDFLAGS) $(INIPARSER_LDFLAGS)
@@ -114,16 +105,16 @@ all-local:
 		$(subst -pthread,-Wc$(COMMA)-pthread,$(GLIB_CFLAGS)) \
 		-I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) \
 			@srcdir@/src/mod_tile.c  \
-			@srcdir@/src/sys_utils.c \
+			@srcdir@/src/g_logger.c \
 			@srcdir@/src/store.c \
 			@srcdir@/src/store_file.c \
 			@srcdir@/src/store_file_utils.c \
 			@srcdir@/src/store_memcached.c \
+			@srcdir@/src/store_null.c \
 			@srcdir@/src/store_rados.c \
-			@srcdir@/src/store_ro_http_proxy.c \
 			@srcdir@/src/store_ro_composite.c \
-			@srcdir@/src/store_null.c \
-			@srcdir@/src/g_logger.c
+			@srcdir@/src/store_ro_http_proxy.c \
+			@srcdir@/src/sys_utils.c
 
 install-mod_tile:
 	mkdir -p $(DESTDIR)`$(APXS) -q LIBEXECDIR`
@@ -132,13 +123,13 @@ install-mod_tile:
 		$(subst -pthread,-Wc$(COMMA)-pthread,$(GLIB_CFLAGS)) \
 		-I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) \
 			@srcdir@/src/mod_tile.c \
-			@srcdir@/src/sys_utils.c \
+			@srcdir@/src/g_logger.c \
 			@srcdir@/src/store.c \
 			@srcdir@/src/store_file.c \
 			@srcdir@/src/store_file_utils.c \
 			@srcdir@/src/store_memcached.c \
+			@srcdir@/src/store_null.c \
 			@srcdir@/src/store_rados.c \
-			@srcdir@/src/store_ro_http_proxy.c \
 			@srcdir@/src/store_ro_composite.c \
-			@srcdir@/src/store_null.c \
-			@srcdir@/src/g_logger.c
+			@srcdir@/src/store_ro_http_proxy.c \
+			@srcdir@/src/sys_utils.c

README.rst

@@ -65,7 +65,7 @@ when using it on an operating system this is not being packaged for.
 We prepared instructions for you on how to build the software on the following
 distributions:
 
-* `CentOS </docs/build/building_on_centos.md>`__
+* `Arch Linux </docs/build/building_on_arch_linux.md>`__
 * `CentOS Stream </docs/build/building_on_centos_stream.md>`__
 * `Debian </docs/build/building_on_debian.md>`__
 * `Fedora </docs/build/building_on_fedora.md>`__

configure.ac

@@ -11,7 +11,7 @@ AC_INIT([mod_tile],
         [http://trac.openstreetmap.org])
 AM_INIT_AUTOMAKE([subdir-objects])
 LT_INIT
-AC_CONFIG_SRCDIR([src/convert_meta.c])
+AC_CONFIG_SRCDIR([src/mod_tile.c])
 AC_CONFIG_HEADERS([includes/config.h])
 AC_CONFIG_MACRO_DIR([m4])
 

docs/man/render_expired.1

@@ -6,7 +6,7 @@ render_expired \- expires a list of map tiles so that they get re-rendered.
 
 .SH SYNOPSIS
 .B render_expired
-.RI [ options ] <  "expire.list"
+.RI [ options ]\ <\  "expire.list"
 .BR
 
 .SH DESCRIPTION
@@ -27,13 +27,13 @@ Render_expired has three potential strategies of how to expire map tiles:
 These three strategies can be combined and applied at different zoom levels. E.g. Zoom level 17-18 get deleted, z11 - z16 get marked dirty and z6 - z10 get rendered directly.
 .PP
 Render_expired takes a list of tiles from stdin which should be expired. The format of the list is one tile per line specified as z/x/y.
-.BR
+.sp 0
 1/0/1
-.BR
+.sp 0
 1/1/1
-.BR
+.sp 0
 1/0/0
-.BR
+.sp 0
 1/1/0
 .PP
 render_expired will automatically expand the list to cover the effected tiles at other zoom levels.
@@ -52,24 +52,23 @@ Specify the location of the renderd socket or hostname and port to connect to.
 .TP
 \fB\-n\fR|\-\-num-threads=N
 Specify the number of parallel requests to renderd. Should renderd have less threads active, requests will be queued. The default is 1.
-default if \fB\-\-append\fR is not specified.
 .TP
 \fB\-t\fR|\-\-tile-dir=DIR
 Specify the base directory where the rendered tiles are. The default is '/var/cache/renderd/tiles'
 .TP
 \fB\-z\fR|\-\-min-zoom=ZOOM
-Filter input to only render tiles greater or equal to this zoom level (default is 0)
+Filter input to only render tiles greater than or equal to this zoom level (default is '0').
 .TP
 \fB\-Z\fR|\-\-max-zoom=ZOOM
-Filter input to only render tiles less than or equal to this zoom level (default is 18)
+Filter input to only render tiles less than or equal to this zoom level (default is '18').
 .TP
 \fB\-d\fR|\-\-delete-from=ZOOM
 When expiring tiles of ZOOM or higher, delete them instead of re-rendering (default is off)
 .TP
 \fB\-T\fR|\-\-touch-from=ZOOM
-when expiring tiles of ZOOM or higher, touch them instead of re-rendering (default is off)
+When expiring tiles of ZOOM or higher, touch them instead of re-rendering (default is off)
 .TP
-\-\-no-progress
+\fB\-N\fR|\-\-no-progress
 Disable display of progress messages (default is off)
 .TP
 \fB\-h\fR|\-\-help

docs/man/render_list.1

@@ -6,7 +6,7 @@ render_list \- renders a list of map tiles by sending requests to a rendering da
 
 .SH SYNOPSIS
 .B render_list
-.RI [ options ] <  "render.list"
+.RI [ options ]\ <\  "render.list"
 .BR
 
 .SH DESCRIPTION
@@ -30,37 +30,45 @@ Render all tiles in given zoom level range instead of reading from STDIN.
 Render tiles even if they seem current.
 .TP
 \fB\-m\fR|\-\-map=MAP
-Render tiles in this map (defaults to 'default').
+Render tiles in this map (default is 'default').
 .TP
 \fB\-l\fR|\-\-max-load=LOAD
-Sleep if load is this high (defaults to 16).
+Sleep if load is this high (default is '16').
 .TP
 \fB\-s\fR|\-\-socket=SOCKET|HOSTNAME:PORT
 Unix domain socket name or hostname and port for contacting renderd (default is '/run/renderd/renderd.sock').
 .TP
 \fB\-n\fR|\-\-num-threads=N
-The number of parallel request threads (default 1).
+The number of parallel request threads (default is '1').
 .TP
-\fB\-t\fR|\-\-tile-dir
-Tile cache directory (defaults to '/var/cache/renderd/tiles').
+\fB\-t\fR|\-\-tile-dir=TILE_DIR
+Tile cache directory (default is '/var/cache/renderd/tiles').
 .TP
 \fB\-z\fR|\-\-min-zoom=ZOOM
-Filter input to only render tiles greater or equal to this zoom level (default is 0).
+Filter input to only render tiles greater than or equal to this zoom level (default is '0').
 .TP
 \fB\-Z\fR|\-\-max-zoom=ZOOM
-Filter input to only render tiles less than or equal to this zoom level (default is 20).
+Filter input to only render tiles less than or equal to this zoom level (default is '20').
+.TP
+\fB\-h\fR|\-\-help
+Print out a help text for render_list
+.TP
+\fB\-V\fR|\-\-version
+Print out the version number for render_list
 .PP
-If you are using --all, you can restrict the tile range by adding these options:
-.BR
-  -x, --min-x=X        minimum X tile coordinate
+If you are using \fB\-a\fR|\-\-all, you can restrict the tile range by adding these options:
+.sp 0
+(please note that tile coordinates must be positive integers and are not latitude and longitude values)
+.PP
+  \fB\-x\fR|\-\-min-x=X            minimum X tile coordinate
 .BR
-  -X, --max-x=X        maximum X tile coordinate
+  \fB\-X\fR|\-\-max-x=X            maximum X tile coordinate
 .BR
-  -y, --min-y=Y        minimum Y tile coordinate
+  \fB\-y\fR|\-\-min-y=Y            minimum Y tile coordinate
 .BR
-  -Y, --max-y=Y        maximum Y tile coordinate
+  \fB\-Y\fR|\-\-max-y=Y            maximum Y tile coordinate
 .PP
-Without --all, send a list of tiles to be rendered from STDIN in the format:
+Without \fB\-a\fR|\-\-all, send a list of tiles to be rendered from STDIN in the format:
 .BR
   X Y Z
 .BR
@@ -73,14 +81,8 @@ e.g.
   1 0 1
 .BR
   1 1 1
-.BR
+.PP
 The above would cause all 4 tiles at zoom 1 to be rendered
-.TP
-\fB\-h\fR|\-\-help
-Print out a help text for render_list
-.TP
-\fB\-V\fR|\-\-version
-Print out the version number for render_list
 .PP
 
 .SH SEE ALSO

includes/cache_expire.h

@@ -26,8 +26,8 @@ extern "C" {
 #define HTCP_EXPIRE_CACHE_PORT "4827"
 
 
-void cache_expire(int sock, char * host, char * uri, int x, int y, int z);
-int init_cache_expire(char * htcphost);
+void cache_expire(int sock, char *host, char *uri, int x, int y, int z);
+int init_cache_expire(char *htcphost);
 
 #ifdef __cplusplus
 }

includes/config.h.in

@@ -1,3 +1,5 @@
+#ifndef CONFIG_H
+#define CONFIG_H
 /* Define to 1 if you have the functions. */
 #cmakedefine HAVE_DAEMON @HAVE_DAEMON@
 #cmakedefine HAVE_GETLOADAVG @HAVE_GETLOADAVG@
@@ -25,3 +27,4 @@
 
 /* Version number of project */
 #cmakedefine VERSION "@VERSION@"
+#endif

includes/g_logger.h

@@ -15,8 +15,8 @@
  * along with this program; If not, see http://www.gnu.org/licenses/.
  */
 
-#ifndef GLOGGER_H
-#define GLOGGER_H
+#ifndef G_LOGGER_H
+#define G_LOGGER_H
 
 #include <glib.h>
 

includes/gen_tile.h

@@ -24,8 +24,14 @@
 extern "C" {
 #endif
 
-
-enum queueEnum {queueRequest, queueRequestPrio, queueRequestBulk, queueDirty, queueRender,  queueDuplicate, queueRequestLow};
+enum queueEnum { queueRequest,
+		 queueRequestPrio,
+		 queueRequestBulk,
+		 queueDirty,
+		 queueRender,
+		 queueDuplicate,
+		 queueRequestLow
+	       };
 
 struct item {
 	struct item *next;
@@ -38,11 +44,11 @@ struct item {
 	enum queueEnum originatedQueue;
 };
 
-//int render(Map &m, int x, int y, int z, const char *filename);
+// int render(Map &m, int x, int y, int z, const char *filename);
 void *render_thread(void *);
 struct item *fetch_request(void);
 void delete_request(struct item *item);
-void render_init(const char *plugins_dir, const char* font_dir, int font_recurse);
+void render_init(const char *plugins_dir, const char *font_dir, int font_recurse);
 
 #ifdef __cplusplus
 }