[tracker] libtracker-common: Consistently use long in get_memory_total
- From: JÃrg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] libtracker-common: Consistently use long in get_memory_total
- Date: Tue, 14 Aug 2012 08:53:37 +0000 (UTC)
commit 9c78611c88bc2f9466718abb29f9ceb961139365
Author: JÃrg Billeter <j bitron ch>
Date: Tue Aug 14 10:37:37 2012 +0200
libtracker-common: Consistently use long in get_memory_total
src/libtracker-common/tracker-os-dependant-unix.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/src/libtracker-common/tracker-os-dependant-unix.c b/src/libtracker-common/tracker-os-dependant-unix.c
index 0baa421..5c36c71 100644
--- a/src/libtracker-common/tracker-os-dependant-unix.c
+++ b/src/libtracker-common/tracker-os-dependant-unix.c
@@ -222,7 +222,7 @@ tracker_create_permission_string (struct stat finfo)
#ifndef DISABLE_MEM_LIMITS
-static guint
+static glong
get_memory_total (void)
{
GError *error = NULL;
@@ -253,17 +253,12 @@ get_memory_total (void)
if (end) {
*end = '\0';
- total = 1024 * atol (p);
+ total = 1024L * atol (p);
}
}
g_free (contents);
}
- if (!total) {
- /* Setting limit to an arbitary limit */
- total = RLIM_INFINITY;
- }
-
return total;
}
@@ -279,9 +274,15 @@ tracker_memory_setrlimits (void)
glong limit;
total = get_memory_total ();
+
+ if (!total) {
+ /* total amount of memory unknown */
+ return FALSE;
+ }
+
total_halfed = total / 2;
- /* Clamp memory between 50% of total and MAXLONG (2Gb) */
+ /* Clamp memory between 50% of total and MAXLONG (2GB on 32-bit) */
limit = CLAMP (total_halfed, MEM_LIMIT_MIN, G_MAXLONG);
/* We want to limit the max virtual memory
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]