[tracker/tracker-0.12] tracker-extract, text: Use O_NOATIME for opening text files
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/tracker-0.12] tracker-extract, text: Use O_NOATIME for opening text files
- Date: Thu, 22 Sep 2011 16:08:18 +0000 (UTC)
commit 45974b2aaa97337c65f8b8cefad2f2e86cfd572c
Author: Philip Van Hoof <philip codeminded be>
Date: Thu Sep 22 14:21:46 2011 +0200
tracker-extract, text: Use O_NOATIME for opening text files
src/tracker-extract/tracker-extract-text.c | 36 ++++++++++++++++++++-------
1 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-text.c b/src/tracker-extract/tracker-extract-text.c
index 4ae1e27..5cc1345 100644
--- a/src/tracker-extract/tracker-extract-text.c
+++ b/src/tracker-extract/tracker-extract-text.c
@@ -19,9 +19,21 @@
#include "config.h"
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <errno.h>
+#include <fcntl.h>
#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <sys/mman.h>
#include <glib.h>
+#include <glib/gstdio.h>
+
#include <gio/gio.h>
#include <libtracker-extract/tracker-extract.h>
@@ -35,9 +47,9 @@ static gchar *
get_file_content (GFile *file,
gsize n_bytes)
{
- GFileInputStream *stream;
GError *error = NULL;
- gchar *text, *uri;
+ gchar *text, *uri, *path;
+ int fd;
/* If no content requested, return */
if (n_bytes == 0) {
@@ -47,14 +59,17 @@ get_file_content (GFile *file,
uri = g_file_get_uri (file);
/* Get filename from URI */
- stream = g_file_read (file, NULL, &error);
- if (error) {
- g_message ("Could not read file '%s': %s",
+ path = g_file_get_path (file);
+
+ fd = g_open (path, O_RDONLY | O_NOATIME, 0);
+
+ if (fd == -1) {
+ g_message ("Could not open file '%s': %s",
uri,
error->message);
g_error_free (error);
g_free (uri);
-
+ g_free (path);
return NULL;
}
@@ -62,12 +77,13 @@ get_file_content (GFile *file,
uri, n_bytes);
/* Read up to n_bytes from stream. Output is always, always valid UTF-8 */
- text = tracker_read_text_from_stream (G_INPUT_STREAM (stream),
- n_bytes,
- TRY_LOCALE_TO_UTF8_CONVERSION);
+ text = tracker_read_text_from_fd (fd,
+ n_bytes,
+ TRY_LOCALE_TO_UTF8_CONVERSION);
- g_object_unref (stream);
+ close (fd);
g_free (uri);
+ g_free (path);
return text;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]