rpms/imsettings/devel imsettings-close-fd.patch, NONE, 1.1 imsettings.spec, 1.41, 1.42

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16966

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-close-fd.patch 
Log Message:
* Thu Sep 17 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-5
- Fix taking too much CPU issue.

imsettings-close-fd.patch:
 factory.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE imsettings-close-fd.patch ---
2009-09-17  Akira TAGOH  <tagoh at redhat.com>

	* src/factory.c (_stop_process): get rid of the unnecessary increasing
	the reference count, which causes taking a lot CPU load again.

Index: src/factory.c
===================================================================
--- src/factory.c	(リビジョン 345)
+++ src/factory.c	(リビジョン 346)
@@ -652,7 +652,7 @@
 {
 	gboolean retval = FALSE;
 	GHashTable *hash;
-	struct ProcessInformation *info, *tmp;
+	struct ProcessInformation *info;
 
 	if (is_body) {
 		hash = priv->body2info;
@@ -670,17 +670,13 @@
 			retval = TRUE;
 		}
 	} else {
-		tmp = _process_info_ref(info);
 		/* info will be deleted from *2info Hash table at _watch_im_status_cb when the process is really died. */
 		g_hash_table_remove(priv->pid2id, GINT_TO_POINTER (info->pid));
 		if (kill(-info->pid, SIGTERM) == -1) {
-			gchar *module = g_strdup(identity);
-
 			g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_UNABLE_TO_TRACK_IM,
 				    _("Couldn't send a signal to the %s process successfully."),
 				    is_body ? "Main" : "AUX");
 			/* push back to the table */
-			g_hash_table_insert(hash, module, tmp);
 			g_hash_table_insert(priv->pid2id, GINT_TO_POINTER (info->pid), GUINT_TO_POINTER (info->id));
 		} else {
 			GTimeVal time;


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- imsettings.spec	15 Sep 2009 08:03:57 -0000	1.41
+++ imsettings.spec	17 Sep 2009 03:20:02 -0000	1.42
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,7 @@ Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-unref-notify.patch
 Patch3:		imsettings-unref-later.patch
 Patch4:		imsettings-update-info.patch
+Patch5:		imsettings-close-fd.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -92,6 +93,7 @@ This package contains a plugin to get th
 %patch2 -p0 -b .2-unref
 %patch3 -p0 -b .3-zombie
 %patch4 -p0 -b .4-update-info
+%patch5 -p0 -b .5-close-fd
 
 %build
 %configure	\
@@ -217,6 +219,9 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-5
+- Fix taking too much CPU issue.
+
 * Tue Sep 15 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-4
 - Update the IM information as needed if the configuration file is written
   in the script. (#523349)