pacho 14/09/26 10:39:22
Added: gjs-1.40.1-ratelimit-rss.patch
gjs-1.40.1-ownership-transfer.patch
Log:
Apply some upstream fixes that also prevent gjs crashes, bug #523608 by Serge
Gavrilov
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
A188FBD4)
Revision Changes Path
1.1 dev-libs/gjs/files/gjs-1.40.1-ratelimit-rss.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gjs/files/gjs-1.40.1-ratelimit-rss.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gjs/files/gjs-1.40.1-ratelimit-rss.patch?rev=1.1&content-type=text/plain
Index: gjs-1.40.1-ratelimit-rss.patch
===================================================================
>From 791b1a33424897549f487eb75a80f13c4f94437a Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <[email protected]>
Date: Fri, 11 Apr 2014 18:38:57 +0200
Subject: Ratelimit RSS-triggered GCs
When loading a lot of data in memory (for example in the shell
opening the overview, which loads all the desktop files and icons)
the RSS can increase a lot, so we would trigger GCs continously
without any hope of freeing memory, so ratelimit full GCs to at
most one every 5 frames.
https://bugzilla.gnome.org/show_bug.cgi?id=728048
--- a/gjs/jsapi-util.cpp
+++ b/gjs/jsapi-util.cpp
@@ -1176,6 +1176,7 @@
}
static gulong linux_rss_trigger;
+static gint64 last_gc_time;
#endif
/**
@@ -1193,6 +1194,13 @@
/* We initiate a GC if VM or RSS has grown by this much */
gulong vmsize;
gulong rss_size;
+ gint64 now;
+
+ /* We rate limit GCs to at most one per 5 frames.
+ One frame is 16666 microseconds (1000000/60)*/
+ now = g_get_monotonic_time();
+ if (now - last_gc_time < 5 * 16666)
+ return;
_linux_get_self_process_size (&vmsize, &rss_size);
@@ -1209,6 +1217,7 @@
if (rss_size > linux_rss_trigger) {
linux_rss_trigger = (gulong) MIN(G_MAXULONG, rss_size * 1.25);
JS_GC(JS_GetRuntime(context));
+ last_gc_time = now;
} else if (rss_size < (0.75 * linux_rss_trigger)) {
/* If we've shrunk by 75%, lower the trigger */
linux_rss_trigger = (rss_size * 1.25);
1.1 dev-libs/gjs/files/gjs-1.40.1-ownership-transfer.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gjs/files/gjs-1.40.1-ownership-transfer.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gjs/files/gjs-1.40.1-ownership-transfer.patch?rev=1.1&content-type=text/plain
Index: gjs-1.40.1-ownership-transfer.patch
===================================================================
>From a432e83f967f3d15ef14cfa8040f868af13d1e74 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <[email protected]>
Date: Tue, 6 May 2014 19:03:15 +0200
Subject: function: respect ownership transfer of instance parameters
When calling a method that is (transfer full) on the instance
parameter we need to make an extra ref/copy.
https://bugzilla.gnome.org/show_bug.cgi?id=729545
diff --git a/gi/function.cpp b/gi/function.cpp
index 859ea44..792778c 100644
--- a/gi/function.cpp
+++ b/gi/function.cpp
@@ -543,6 +543,7 @@ gjs_fill_method_instance (JSContext *context,
GIBaseInfo *container = g_base_info_get_container((GIBaseInfo *)
function->info);
GIInfoType type = g_base_info_get_type(container);
GType gtype = g_registered_type_info_get_g_type ((GIRegisteredTypeInfo
*)container);
+ GITransfer transfer = g_callable_info_get_instance_ownership_transfer
(function->info);
switch (type) {
case GI_INFO_TYPE_STRUCT:
@@ -553,6 +554,8 @@ gjs_fill_method_instance (JSContext *context,
return JS_FALSE;
out_arg->v_pointer = gjs_gerror_from_error(context, obj);
+ if (transfer == GI_TRANSFER_EVERYTHING)
+ out_arg->v_pointer = g_error_copy ((GError*)
out_arg->v_pointer);
} else {
if (!gjs_typecheck_boxed(context, obj,
container, gtype,
@@ -560,6 +563,14 @@ gjs_fill_method_instance (JSContext *context,
return JS_FALSE;
out_arg->v_pointer = gjs_c_struct_from_boxed(context, obj);
+ if (transfer == GI_TRANSFER_EVERYTHING) {
+ if (gtype != G_TYPE_NONE)
+ out_arg->v_pointer = g_boxed_copy (gtype,
out_arg->v_pointer);
+ else {
+ gjs_throw (context, "Cannot transfer ownership of instance
argument for non boxed structure");
+ return JS_FALSE;
+ }
+ }
}
break;
@@ -569,6 +580,8 @@ gjs_fill_method_instance (JSContext *context,
return JS_FALSE;
out_arg->v_pointer = gjs_c_union_from_union(context, obj);
+ if (transfer == GI_TRANSFER_EVERYTHING)
+ out_arg->v_pointer = g_boxed_copy (gtype, out_arg->v_pointer);
break;
case GI_INFO_TYPE_OBJECT:
@@ -577,10 +590,14 @@ gjs_fill_method_instance (JSContext *context,
if (!gjs_typecheck_object(context, obj, gtype, JS_TRUE))
return JS_FALSE;
out_arg->v_pointer = gjs_g_object_from_object(context, obj);
+ if (transfer == GI_TRANSFER_EVERYTHING)
+ g_object_ref (out_arg->v_pointer);
} else if (gjs_typecheck_is_fundamental(context, obj, JS_FALSE)) {
if (!gjs_typecheck_fundamental(context, obj, gtype, JS_TRUE))
return JS_FALSE;
out_arg->v_pointer = gjs_g_fundamental_from_object(context, obj);
+ if (transfer == GI_TRANSFER_EVERYTHING)
+ gjs_fundamental_ref (context, out_arg->v_pointer);
} else {
gjs_throw_custom(context, "TypeError",
"%s.%s is not an object instance neither a
fundamental instance of a supported type",
--
cgit v0.10.1
