Hello community,
here is the log from the commit of package gjs for openSUSE:Factory
checked in at Mon May 2 13:35:32 CEST 2011.
--------
--- GNOME/gjs/gjs.changes 2011-03-01 23:02:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/gjs/gjs.changes 2011-04-21
17:36:12.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Apr 4 16:26:11 UTC 2011 - fcro...@novell.com
+
+- Update to version 0.7.14:
+ + bgo#646246: Do connection processing in a high priority
+ timeout.
+- Changes from version 0.7.12:
+ + bgo#643325: Make gjs_debugger_native_trap a JSFastNative
+ + bgo#643817: mallinfo() is slow, look at /proc/self/statm
+ instead.
+ + Various cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gjs-0.7.11.tar.bz2
New:
----
gjs-0.7.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gjs.spec ++++++
--- /var/tmp/diff_new_pack.XgkLEk/_old 2011-05-02 13:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.XgkLEk/_new 2011-05-02 13:34:40.000000000 +0200
@@ -27,7 +27,7 @@
%endif
Name: gjs
-Version: 0.7.11
+Version: 0.7.14
Release: 1
# FIXME: find out if tapsets should really be in devel package or in main
package
License: MIT License (or similar)
@@ -84,7 +84,7 @@
%configure \
--disable-static \
--enable-systemtap
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
%make_install
++++++ gjs-0.7.11.tar.bz2 -> gjs-0.7.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/Makefile.am new/gjs-0.7.14/Makefile.am
--- old/gjs-0.7.11/Makefile.am 2010-11-15 17:10:24.000000000 +0100
+++ new/gjs-0.7.14/Makefile.am 2011-04-04 15:15:50.000000000 +0200
@@ -130,3 +130,18 @@
(cd $(DESTDIR)$(bindir) && ln -sf gjs-console$(EXEEXT) gjs$(EXEEXT))
include Makefile-test.am
+
+prepare-release-tag:
+ TAGNAME=`echo $(PACKAGE) | tr - _ | tr a-z A-Z` \
+ TAGVER=`echo $(VERSION) | sed s/\\\./_/g`; \
+ git tag -m "Tag $(VERSION)" -a "$$TAGNAME"_"$$TAGVER"
+
+prepare-minor-release: $(distdir).tar.bz2 prepare-release-tag
+ python $(top_srcdir)/scripts/verbump.py
+
+upload-release: $(distdir).tar.bz2
+ git log origin/master..master
+ @echo -n "Ok to push? [y/N] "; read ans; test x$$ans == xy || exit 1
+ git push --tags origin master:master
+ scp $(distdir).tar.bz2 master.gnome.org:
+ ssh master.gnome.org install-module $(distdir).tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/Makefile.in new/gjs-0.7.14/Makefile.in
--- old/gjs-0.7.11/Makefile.in 2011-02-23 04:29:38.000000000 +0100
+++ new/gjs-0.7.14/Makefile.in 2011-04-01 20:56:42.000000000 +0200
@@ -2522,6 +2522,21 @@
@ENABLE_COVERAGE_FALSE@.PHONY: lcov
+prepare-release-tag:
+ TAGNAME=`echo $(PACKAGE) | tr - _ | tr a-z A-Z` \
+ TAGVER=`echo $(VERSION) | sed s/\\\./_/g`; \
+ git tag -m "Tag $(VERSION)" -a "$$TAGNAME"_"$$TAGVER"
+
+prepare-minor-release: $(distdir).tar.bz2 prepare-release-tag
+ python $(top_srcdir)/scripts/verbump.py
+
+upload-release: $(distdir).tar.bz2
+ git log origin/master..master
+ @echo -n "Ok to push? [y/N] "; read ans; test x$$ans == xy || exit 1
+ git push --tags origin master:master
+ scp $(distdir).tar.bz2 gnome.org:
+ ssh gnome.org install-module $(distdir).tar.bz2
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/configure new/gjs-0.7.14/configure
--- old/gjs-0.7.11/configure 2011-02-23 04:29:38.000000000 +0100
+++ new/gjs-0.7.14/configure 2011-04-01 20:56:37.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gjs 0.7.11.
+# Generated by GNU Autoconf 2.68 for gjs 0.7.14.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gjs>.
#
@@ -571,8 +571,8 @@
# Identity of this package.
PACKAGE_NAME='gjs'
PACKAGE_TARNAME='gjs'
-PACKAGE_VERSION='0.7.11'
-PACKAGE_STRING='gjs 0.7.11'
+PACKAGE_VERSION='0.7.14'
+PACKAGE_STRING='gjs 0.7.14'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gjs'
PACKAGE_URL=''
@@ -1369,7 +1369,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gjs 0.7.11 to adapt to many kinds of systems.
+\`configure' configures gjs 0.7.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1439,7 +1439,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gjs 0.7.11:";;
+ short | recursive ) echo "Configuration of gjs 0.7.14:";;
esac
cat <<\_ACEOF
@@ -1579,7 +1579,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gjs configure 0.7.11
+gjs configure 0.7.14
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2069,7 +2069,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gjs $as_me 0.7.11, which was
+It was created by gjs $as_me 0.7.14, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2884,7 +2884,7 @@
# Define the identity of the package.
PACKAGE='gjs'
- VERSION='0.7.11'
+ VERSION='0.7.14'
cat >>confdefs.h <<_ACEOF
@@ -15473,12 +15473,13 @@
if test "$GCC" = "yes"; then
for flag in -Wall -Wchar-subscripts -Wmissing-declarations \
- -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align \
- -Wsign-compare;
+ -Wpointer-arith -Wcast-align -Wsign-compare;
do
CFLAGS="`ensureflag $flag $CFLAGS`"
CXXFLAGS="`ensureflag $flag $CXXFLAGS`"
done
+ CFLAGS="`ensureflag -Wmissing-prototypes $CFLAGS`"
+ CFLAGS="`ensureflag -Wnested-externs $CFLAGS`"
fi
# coverage
@@ -17945,7 +17946,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gjs $as_me 0.7.11, which was
+This file was extended by gjs $as_me 0.7.14, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18011,7 +18012,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gjs config.status 0.7.11
+gjs config.status 0.7.14
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/configure.ac new/gjs-0.7.14/configure.ac
--- old/gjs-0.7.11/configure.ac 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/configure.ac 2011-04-01 20:49:49.000000000 +0200
@@ -1,8 +1,13 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
+m4_define(pkg_major_version, 0)
+m4_define(pkg_minor_version, 7)
+m4_define(pkg_micro_version, 14)
+m4_define(pkg_version, pkg_major_version.pkg_minor_version.pkg_micro_version)
+
AC_PREREQ(2.61)
-AC_INIT([gjs], [0.7.11],[http://bugzilla.gnome.org/enter_bug.cgi?product=gjs])
+AC_INIT([gjs], pkg_version,
[http://bugzilla.gnome.org/enter_bug.cgi?product=gjs])
AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
AC_CONFIG_SRCDIR([gjs/console.c])
AC_CONFIG_HEADER([config.h])
@@ -49,12 +54,13 @@
if test "$GCC" = "yes"; then
for flag in -Wall -Wchar-subscripts -Wmissing-declarations \
- -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align \
- -Wsign-compare;
+ -Wpointer-arith -Wcast-align -Wsign-compare;
do
CFLAGS="`ensureflag $flag $CFLAGS`"
CXXFLAGS="`ensureflag $flag $CXXFLAGS`"
done
+ CFLAGS="`ensureflag -Wmissing-prototypes $CFLAGS`"
+ CFLAGS="`ensureflag -Wnested-externs $CFLAGS`"
fi
# coverage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gi/boxed.c new/gjs-0.7.14/gi/boxed.c
--- old/gjs-0.7.11/gi/boxed.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gi/boxed.c 2011-03-10 22:46:51.000000000 +0100
@@ -490,7 +490,6 @@
GType gtype = g_registered_type_info_get_g_type(
(GIRegisteredTypeInfo*) priv->info);
if (gtype != G_TYPE_NONE) {
priv->gboxed = g_boxed_copy(gtype, source_priv->gboxed);
- gjs_maybe_gc(context);
GJS_NATIVE_CONSTRUCTOR_FINISH(boxed);
return JS_TRUE;
}
@@ -545,7 +544,6 @@
}
unthreadsafe_template_for_constructor.gboxed = NULL;
- gjs_maybe_gc(context);
retval = priv->gboxed != NULL;
if (retval)
@@ -554,8 +552,6 @@
}
}
- gjs_maybe_gc(context);
-
GJS_NATIVE_CONSTRUCTOR_FINISH(boxed);
return JS_TRUE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gi/function.c new/gjs-0.7.14/gi/function.c
--- old/gjs-0.7.11/gi/function.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gi/function.c 2011-03-10 22:31:26.000000000 +0100
@@ -548,11 +548,9 @@
out_args_pos++;
} else {
GArgument *in_value;
- GITypeTag type_tag;
GITypeInfo ainfo;
g_arg_info_load_type(&arg_info, &ainfo);
- type_tag = g_type_info_get_tag(&ainfo);
g_assert_cmpuint(in_args_pos, <, in_args_len);
in_value = &in_arg_cvalues[in_args_pos];
@@ -844,7 +842,6 @@
jsval *js_argv = JS_ARGV(context, vp);
JSObject *object = JS_THIS_OBJECT(context, vp);
JSObject *callee = JSVAL_TO_OBJECT(JS_CALLEE(context, vp));
- jsval retval;
#else
static JSBool
function_call(JSContext *context,
@@ -999,7 +996,6 @@
GIFunctionInfo *info)
{
guint8 i, n_args;
- gboolean is_method;
GError *error = NULL;
GITypeInfo return_type;
@@ -1008,8 +1004,6 @@
return FALSE;
}
- is_method = (g_function_info_get_flags(info) & GI_FUNCTION_IS_METHOD) != 0;
-
g_callable_info_load_return_type((GICallableInfo*)info, &return_type);
if (g_type_info_get_tag(&return_type) != GI_TYPE_TAG_VOID)
function->js_out_argc += 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gi/keep-alive.c
new/gjs-0.7.14/gi/keep-alive.c
--- old/gjs-0.7.11/gi/keep-alive.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gi/keep-alive.c 2011-03-10 22:46:52.000000000 +0100
@@ -93,6 +93,8 @@
GJS_NATIVE_CONSTRUCTOR_VARIABLES(keep_alive)
KeepAlive *priv;
+ (void) argv;
+
GJS_NATIVE_CONSTRUCTOR_PRELUDE(keep_alive);
priv = g_slice_new0(KeepAlive);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gi/ns.c new/gjs-0.7.14/gi/ns.c
--- old/gjs-0.7.11/gi/ns.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gi/ns.c 2011-03-10 22:46:52.000000000 +0100
@@ -159,6 +159,8 @@
GJS_NATIVE_CONSTRUCTOR_VARIABLES(ns)
Ns *priv;
+ (void) argv;
+
GJS_NATIVE_CONSTRUCTOR_PRELUDE(ns);
priv = g_slice_new0(Ns);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gi/object.c new/gjs-0.7.14/gi/object.c
--- old/gjs-0.7.11/gi/object.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gi/object.c 2011-03-10 22:46:51.000000000 +0100
@@ -771,8 +771,6 @@
GJS_NATIVE_CONSTRUCTOR_FINISH(object_instance);
- gjs_maybe_gc(context);
-
return JS_TRUE;
}
@@ -1185,19 +1183,15 @@
GIObjectInfo *object_info)
{
int i;
- const char *obj_name;
int n_methods;
- obj_name = g_base_info_get_name ((GIBaseInfo*)object_info);
n_methods = g_object_info_get_n_methods(object_info);
for (i = 0; i < n_methods; i++) {
GIFunctionInfo *meth_info;
GIFunctionInfoFlags flags;
- const char *name;
meth_info = g_object_info_get_method(object_info, i);
- name = g_base_info_get_name((GIBaseInfo*)meth_info);
flags = g_function_info_get_flags (meth_info);
/* Anything that isn't a method we put on the prototype of the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gi/param.c new/gjs-0.7.14/gi/param.c
--- old/gjs-0.7.11/gi/param.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gi/param.c 2011-03-10 22:46:52.000000000 +0100
@@ -160,6 +160,8 @@
GJS_NATIVE_CONSTRUCTOR_PRELUDE(param);
+ (void) argv;
+
priv = g_slice_new0(Param);
GJS_INC_COUNTER(param);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gi/repo.c new/gjs-0.7.14/gi/repo.c
--- old/gjs-0.7.11/gi/repo.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gi/repo.c 2011-03-10 22:46:52.000000000 +0100
@@ -174,6 +174,8 @@
GJS_NATIVE_CONSTRUCTOR_PRELUDE(repo);
+ (void) argv;
+
priv = g_slice_new0(Repo);
GJS_INC_COUNTER(repo);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gi/union.c new/gjs-0.7.14/gi/union.c
--- old/gjs-0.7.11/gi/union.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gi/union.c 2011-03-10 22:46:52.000000000 +0100
@@ -221,6 +221,8 @@
priv = g_slice_new0(Union);
+ (void) argv;
+
GJS_INC_COUNTER(boxed);
g_assert(priv_from_js(context, object) == NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gjs/importer.c
new/gjs-0.7.14/gjs/importer.c
--- old/gjs-0.7.11/gjs/importer.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gjs/importer.c 2011-03-10 22:46:52.000000000 +0100
@@ -971,6 +971,7 @@
Importer *priv;
GJS_NATIVE_CONSTRUCTOR_PRELUDE(importer);
+ (void) argv;
priv = g_slice_new0(Importer);
@@ -1043,6 +1044,7 @@
JSObject *importer;
Importer *priv;
JSObject *global;
+ (void) priv;
global = gjs_get_import_global(context);
@@ -1083,8 +1085,6 @@
if (importer == NULL)
gjs_fatal("No memory to create ns object");
- priv = priv_from_js(context, importer);
-
return importer;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gjs/jsapi-util.c
new/gjs-0.7.14/gjs/jsapi-util.c
--- old/gjs-0.7.11/gjs/jsapi-util.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/gjs/jsapi-util.c 2011-03-10 21:38:05.000000000 +0100
@@ -34,9 +34,6 @@
#include <string.h>
#include <math.h>
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
GQuark
gjs_util_error_quark (void)
@@ -1523,6 +1520,41 @@
return JS_FALSE;
}
+#ifdef __linux__
+static void
+_linux_get_self_process_size (gulong *vm_size,
+ gulong *rss_size)
+{
+ char *contents;
+ char *iter;
+ gsize len;
+ int i;
+
+ *vm_size = *rss_size = 0;
+
+ if (!g_file_get_contents ("/proc/self/stat", &contents, &len, NULL))
+ return;
+
+ iter = contents;
+ /* See "man proc" for where this 22 comes from */
+ for (i = 0; i < 22; i++) {
+ iter = strchr (iter, ' ');
+ if (!iter)
+ goto out;
+ iter++;
+ }
+ sscanf (iter, " %lu", vm_size);
+ iter = strchr (iter, ' ');
+ if (iter)
+ sscanf (iter, " %lu", rss_size);
+
+ out:
+ g_free (contents);
+}
+
+static gulong linux_rss_trigger;
+#endif
+
/**
* gjs_maybe_gc:
*
@@ -1531,32 +1563,33 @@
void
gjs_maybe_gc (JSContext *context)
{
- /* Picked this number out of the air basically; 16 megabytes
- * "feels" good for all of mobile/embedded/GP. We don't
- * expect the cost of JS_GC() to be too high, but we
- * also don't want to call it too often.
- *
- * A better approach actually may be to dynamically watch "free";
- * how much memory we're using before we hit swap. Even better of
- * course: some component of the OS sends us a signal when we
- * should be trying a GC.
- */
-#define _GJS_MAYBE_GC_MALLOC_BYTES (16 * 1024 * 1024)
-
- static int _gjs_last_maybe_gc_malloc_blocks = -1;
-
JS_MaybeGC(context);
-#ifdef HAVE_MALLINFO
+#ifdef __linux__
{
- struct mallinfo mstats;
- mstats = mallinfo();
- if (mstats.uordblks < _gjs_last_maybe_gc_malloc_blocks ||
_gjs_last_maybe_gc_malloc_blocks == -1) {
- _gjs_last_maybe_gc_malloc_blocks = mstats.uordblks;
- } else if ((mstats.uordblks - _gjs_last_maybe_gc_malloc_blocks) >
_GJS_MAYBE_GC_MALLOC_BYTES) {
+ /* We initiate a GC if VM or RSS has grown by this much */
+ gulong vmsize;
+ gulong rss_size;
+
+ _linux_get_self_process_size (&vmsize, &rss_size);
+
+ /* linux_rss_trigger is initialized to 0, so currently
+ * we always do a full GC early.
+ *
+ * Here we see if the RSS has grown by 25% since
+ * our last look; if so, initiate a full GC. In
+ * theory using RSS is bad if we get swapped out,
+ * since we may be overzealous in GC, but on the
+ * other hand, if swapping is going on, better
+ * to GC.
+ */
+ if (rss_size > linux_rss_trigger) {
+ linux_rss_trigger = (gulong) MIN(G_MAXULONG, rss_size * 1.25);
JS_GC(context);
- _gjs_last_maybe_gc_malloc_blocks = mstats.uordblks;
+ } 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);
}
- }
-#endif
+ }
+#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gjs-dbus/dbus-proxy.c
new/gjs-0.7.14/gjs-dbus/dbus-proxy.c
--- old/gjs-0.7.11/gjs-dbus/dbus-proxy.c 2010-08-19 20:26:03.000000000
+0200
+++ new/gjs-0.7.14/gjs-dbus/dbus-proxy.c 2011-03-10 22:31:26.000000000
+0100
@@ -169,14 +169,11 @@
GObjectConstructParam *construct_params)
{
GObject *object;
- GjsDBusProxy *proxy;
object = (* G_OBJECT_CLASS (gjs_dbus_proxy_parent_class)->constructor)
(type,
n_construct_properties,
construct_params);
- proxy = GJS_DBUS_PROXY(object);
-
return object;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gjs-dbus/dbus.c
new/gjs-0.7.14/gjs-dbus/dbus.c
--- old/gjs-0.7.11/gjs-dbus/dbus.c 2010-04-18 02:55:15.000000000 +0200
+++ new/gjs-0.7.14/gjs-dbus/dbus.c 2011-04-01 21:45:44.000000000 +0200
@@ -349,11 +349,19 @@
{
if (bus_type == DBUS_BUS_SESSION) {
if (session_connect_idle_id == 0) {
- session_connect_idle_id = g_idle_add(connect_idle,
GINT_TO_POINTER(bus_type));
+ /* We use G_PRIORITY_HIGH to ensure that any deferred
+ * work (such as setting up exports) happens *before*
+ * potentially reading any messages from the socket. If we
+ * didn't, this could lead to race conditions. See
+ * https://bugzilla.gnome.org/show_bug.cgi?id=646246
+ */
+ session_connect_idle_id = g_timeout_add_full(G_PRIORITY_HIGH, 0,
connect_idle,
+
GINT_TO_POINTER(bus_type), NULL);
}
} else if (bus_type == DBUS_BUS_SYSTEM) {
if (system_connect_idle_id == 0) {
- system_connect_idle_id = g_idle_add(connect_idle,
GINT_TO_POINTER(bus_type));
+ system_connect_idle_id = g_timeout_add_full(G_PRIORITY_HIGH, 0,
connect_idle,
+
GINT_TO_POINTER(bus_type), NULL);
}
} else {
g_assert_not_reached();
@@ -1056,6 +1064,7 @@
GjsDBusInfo *info;
info = _gjs_dbus_ensure_info(connection);
+ (void) info;
if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS,
"NameOwnerChanged") &&
dbus_message_has_sender(message, DBUS_SERVICE_DBUS)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gjs-dbus/dbus.h
new/gjs-0.7.14/gjs-dbus/dbus.h
--- old/gjs-0.7.11/gjs-dbus/dbus.h 2010-04-18 02:55:15.000000000 +0200
+++ new/gjs-0.7.14/gjs-dbus/dbus.h 2011-03-10 22:31:25.000000000 +0100
@@ -86,7 +86,7 @@
void *data);
typedef struct {
- const char *name;
+ char *name;
GjsDBusNameType type;
GjsDBusNameAcquiredFunc acquired;
GjsDBusNameLostFunc lost;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/gjs-internals-1.0.pc.in
new/gjs-0.7.14/gjs-internals-1.0.pc.in
--- old/gjs-0.7.11/gjs-internals-1.0.pc.in 2010-10-23 20:01:22.000000000
+0200
+++ new/gjs-0.7.14/gjs-internals-1.0.pc.in 2011-03-09 19:11:49.000000000
+0100
@@ -11,6 +11,7 @@
mozjslibdir=@FIREFOX_JS_LIBDIR@
Cflags: -I${includedir}/gjs-1.0 @JS_EXTRA_CFLAGS@
+Libs: -Wl,--rpath=${mozjslibdir}
Requires: gjs-1.0 gobject-introspection-1.0 @JS_PACKAGE@
Name: gjs-internals-1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/modules/dbus-exports.c
new/gjs-0.7.14/modules/dbus-exports.c
--- old/gjs-0.7.11/modules/dbus-exports.c 2011-02-23 04:25:10.000000000
+0100
+++ new/gjs-0.7.14/modules/dbus-exports.c 2011-03-10 22:46:52.000000000
+0100
@@ -1713,6 +1713,8 @@
GJS_NATIVE_CONSTRUCTOR_PRELUDE(js_exports);
+ (void) argv;
+
priv = g_slice_new0(Exports);
GJS_INC_COUNTER(dbus_exports);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/modules/dbus.c
new/gjs-0.7.14/modules/dbus.c
--- old/gjs-0.7.11/modules/dbus.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/modules/dbus.c 2011-04-01 20:49:49.000000000 +0200
@@ -362,10 +362,6 @@
static void
pending_free_closure(void *data)
{
- GClosure *closure;
-
- closure = data;
-
g_closure_invalidate(data);
g_closure_unref(data);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gjs-0.7.11/modules/debugger.c
new/gjs-0.7.14/modules/debugger.c
--- old/gjs-0.7.11/modules/debugger.c 2011-02-23 04:25:10.000000000 +0100
+++ new/gjs-0.7.14/modules/debugger.c 2011-03-10 22:31:25.000000000 +0100
@@ -31,8 +31,7 @@
#include "debugger.h"
static JSBool
-gjs_debugger_native_trap(JSContext *cx, JSObject *obj, uintN argc,
- jsval *argv, jsval *retval)
+gjs_debugger_native_trap(JSContext *cx, uintN argc, jsval *vp)
{
G_BREAKPOINT();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
