[maemo-commits] [maemo-commits] r12302 - in projects/haf/trunk/maemo-launcher: . debian launcher

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-06-14 16:39:20 +0300 (Thu, 14 Jun 2007)
New Revision: 12302

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/launcher/launcher.c
Log:
Load the program binary after having adjusted the process priority and
oom_adj value. (Fixes: NB#59173)


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-06-14 12:30:25 UTC (rev 12301)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-06-14 13:39:20 UTC (rev 12302)
@@ -1,3 +1,8 @@
+2007-06-14  Guillem Jover  <guillem.jover at nokia.com>
+
+	* launcher/launcher.c (launch_process): Move load_prog after adjusting
+	the process priority and oom_adj values.
+
 2007-03-08  Guillem Jover  <guillem.jover at nokia.com>
 
 	* launcher/booster.pc.in (exec_prefix): New variable.

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2007-06-14 12:30:25 UTC (rev 12301)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2007-06-14 13:39:20 UTC (rev 12302)
@@ -3,6 +3,8 @@
   * New Upstream Release.
   * Add new package maemo-launcher-dev and include the header file
     for the boosters and the pkgconfig file. (Fixes: NM#1027)
+  * Load the program binary after having adjusted the process priority and
+    oom_adj value. (Fixes: NB#59173)
 
  -- Guillem Jover <guillem.jover at nokia.com>  Wed, 21 Feb 2007 14:41:33 +0200
 

Modified: projects/haf/trunk/maemo-launcher/launcher/launcher.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-06-14 12:30:25 UTC (rev 12301)
+++ projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-06-14 13:39:20 UTC (rev 12302)
@@ -128,8 +128,6 @@
 {
   int cur_prio;
 
-  load_main(prog);
-
   /* Possibly restore process priority. */
   errno = 0;
   cur_prio = getpriority(PRIO_PROCESS, 0);
@@ -140,6 +138,8 @@
   if (prog->prio >= 0)
     oom_unprotect();
 
+  load_main(prog);
+
   print_prog_env_argv(prog);
 
   debug("launching process: '%s'\n", prog->filename);