Adding upstream version 2.11.2.upstream/2.11.2upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 180 insertions, 0 deletions

diff --git a/lib/orderfiles.c b/lib/orderfiles.c
new file mode 100644
index 0000000..05bafe9
--- /dev/null
+++ b/lib/orderfiles.c
@@ -0,0 +1,180 @@
+/*
+ * orderfiles.c: order file accesses to optimise disk load
+ *
+ * Copyright (C) 2014 Colin Watson.
+ *
+ * Inspired by and loosely based on dpkg/src/filesdb.c, which is:
+ *   Copyright (C) 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ *   Copyright (C) 2000,2001 Wichert Akkerman <wakkerma@debian.org>
+ *   Copyright (C) 2008-2014 Guillem Jover <guillem@debian.org>
+ *
+ * This file is part of man-db.
+ *
+ * man-db is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * man-db is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with man-db; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifdef HAVE_LINUX_FIEMAP_H
+#  include <linux/fiemap.h>
+#  include <linux/fs.h>
+#  include <sys/ioctl.h>
+#  include <sys/vfs.h>
+#endif /* HAVE_LINUX_FIEMAP_H */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "attribute.h"
+#include "gl_hash_map.h"
+#include "gl_rbtree_list.h"
+#include "gl_xlist.h"
+#include "gl_xmap.h"
+#include "xalloc.h"
+
+#include "manconfig.h"
+
+#include "glcontainers.h"
+#include "orderfiles.h"
+
+#if defined(HAVE_LINUX_FIEMAP_H)
+gl_map_t physical_offsets = NULL;
+
+static int compare_physical_offsets (const void *a, const void *b)
+{
+	const char *left = (const char *) a;
+	const char *right = (const char *) b;
+	const uint64_t *left_offset_p = gl_map_get (physical_offsets, left);
+	const uint64_t *right_offset_p = gl_map_get (physical_offsets, right);
+	uint64_t left_offset = left_offset_p ? *left_offset_p : UINT64_MAX;
+	uint64_t right_offset = right_offset_p ? *right_offset_p : UINT64_MAX;
+
+	if (left_offset < right_offset)
+		return -1;
+	else if (left_offset > right_offset)
+		return 1;
+	else
+		return 0;
+}
+
+void order_files (const char *dir, gl_list_t *basenamesp)
+{
+	gl_list_t basenames = *basenamesp, sorted_basenames;
+	int dir_fd_open_flags;
+	int dir_fd;
+	struct statfs fs;
+	const char *name;
+
+	dir_fd_open_flags = O_SEARCH | O_DIRECTORY;
+#ifdef O_PATH
+	dir_fd_open_flags |= O_PATH;
+#endif
+	dir_fd = open (dir, dir_fd_open_flags);
+	if (dir_fd < 0)
+		return;
+
+	if (fstatfs (dir_fd, &fs) < 0) {
+		close (dir_fd);
+		return;
+	}
+
+	/* Sort files by the physical locations of their first blocks, in an
+	 * attempt to minimise disk drive head movements.  This assumes that
+	 * files are small enough that they are likely to be in one block or
+	 * a small number of contiguous blocks, which seems a reasonable
+	 * assumption for manual pages.
+	 */
+	physical_offsets = gl_map_create_empty (GL_HASH_MAP, string_equals,
+						string_hash, NULL, plain_free);
+	sorted_basenames = new_string_list (GL_RBTREE_LIST, false);
+	GL_LIST_FOREACH (basenames, name) {
+		struct {
+			struct fiemap fiemap;
+			struct fiemap_extent extent;
+		} fm;
+		int fd;
+
+		fd = openat (dir_fd, name, O_RDONLY);
+		if (fd < 0)
+			continue;
+
+		memset (&fm, 0, sizeof (fm));
+		fm.fiemap.fm_start = 0;
+		fm.fiemap.fm_length = fs.f_bsize;
+		fm.fiemap.fm_flags = 0;
+		fm.fiemap.fm_extent_count = 1;
+
+		if (ioctl (fd, FS_IOC_FIEMAP, (unsigned long) &fm) == 0) {
+			uint64_t *offset = XMALLOC (uint64_t);
+			*offset = fm.extent.fe_physical;
+			/* Borrow the key from basenames; since
+			 * physical_offsets has a shorter lifetime, we don't
+			 * need to duplicate it.
+			 */
+			gl_map_put (physical_offsets, name, offset);
+		}
+
+		close (fd);
+		gl_sortedlist_add (sorted_basenames, compare_physical_offsets,
+				   xstrdup (name));
+	}
+	gl_map_free (physical_offsets);
+	physical_offsets = NULL;
+	close (dir_fd);
+	gl_list_free (basenames);
+	*basenamesp = sorted_basenames;
+}
+#elif defined(HAVE_POSIX_FADVISE)
+void order_files (const char *dir, gl_list_t *basenamesp)
+{
+	gl_list_t basenames = *basenamesp;
+	int dir_fd_open_flags;
+	int dir_fd;
+	const char *name;
+
+	dir_fd_open_flags = O_SEARCH | O_DIRECTORY;
+#ifdef O_PATH
+	dir_fd_open_flags |= O_PATH;
+#endif
+	dir_fd = open (dir, dir_fd_open_flags);
+	if (dir_fd < 0)
+		return;
+
+	/* While we can't actually order the files, we can at least ask the
+	 * kernel to preload them.
+	 */
+	GL_LIST_FOREACH (basenames, name) {
+		int fd = openat (dir_fd, name, O_RDONLY | O_NONBLOCK);
+		if (fd >= 0) {
+			posix_fadvise (fd, 0, 0, POSIX_FADV_WILLNEED);
+			close (fd);
+		}
+	}
+
+	close (dir_fd);
+}
+#else
+void order_files (const char *dir MAYBE_UNUSED,
+		  gl_list_t *basenamesp MAYBE_UNUSED)
+{
+}
+#endif