Merge lp:~cszikszoy/do/core-nativecode-move into lp:do

[Chris S.]

[Chris S. (cszikszoy)]

This moves the platform specific SetProcessName code out of core, and into the system service. With this core should be entirely platform independent!

[Robert Dyer (psybers)]

Why comment it out on line 159? Just remove the old code.

Why add a period to the log on line 161/162?

While you're touching this, might as well merge the two prctl methods on lines 30 and 35, since one one is used (and then calls the other).

Delete the one on 30, make 35 into this:

35 + private static int prctl (int option, string arg2)
36 + {
37 + return prctl (option, Encoding.ASCII.GetBytes (arg2 + "\0"), IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
38 + }

Seems to be a simple move, I can't test this code atm but looking at the diff its fine.

review: Approve

[lp:~cszikszoy/do/core-nativecode-move]

1289. By Chris S. on 2009-08-08

merge linux prctl methods

1290. By Chris S. on 2009-08-10

remove bsd junk, simplify code

Unmerged revisions

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs	2009-07-01 18:04:57 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs	2009-08-08 20:41:29 +0000
@@ -19,7 +19,9 @@
 
 using System;
 using System.IO;
+using System.Text;
 using System.Reflection;
+using System.Runtime.InteropServices;
 
 using NDesk.DBus;
 using org.freedesktop.DBus;
@@ -29,6 +31,8 @@
 
 using Gnome;
 
+using Mono.Unix.Native;
+
 namespace Do.Platform.Linux
 {
 	
@@ -55,6 +59,27 @@
 			event Action OnChanged;
 		}
 		
+		[DllImport ("libc")] // Linux
+		private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5);
+		
+		private static int prctl (int option, byte [] arg2)
+		{
+			return prctl (option, arg2, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
+		}
+
+		private static int prctl (int option, string arg2)
+		{
+			return prctl (option, Encoding.ASCII.GetBytes (arg2 + "\0"));
+		}
+
+		[DllImport ("libc")] // BSD
+		private static extern void setproctitle (byte [] fmt, byte [] name);
+
+		private static void setproctitle (string fmt, string name)
+		{
+			setproctitle (Encoding.ASCII.GetBytes (fmt + "\0"), Encoding.ASCII.GetBytes (name + "\0"));
+		}
+		
 		bool on_battery;
 		
 		IPowerManagement power;
@@ -213,5 +238,45 @@
 				Log<SystemService>.Error ("Failed to update autostart file: {0}", e.Message);
 			}
 		}
+		
+		/// <summary>
+		/// Sets the name of the current process on Linux. Throws EntryPointNotFoundException
+		/// if we are not on Linux.
+		/// </summary>
+		/// <param name="name">
+		/// A <see cref="System.String"/> name to set the process name to.
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.Boolean"/> indicating whether the set was successful.
+		/// </returns>
+		private static bool SetLinuxProcessName (string name)
+		{
+			return prctl (15 /* PR_SET_NAME */, name) == 0;
+		}
+
+		/// <summary>
+		/// Sets the name of the current process on BSD. Throws EntryPointNotFoundException
+		/// if we are not on BSD.
+		/// </summary>
+		/// <param name="name">
+		/// A <see cref="System.String"/> name to set the process name to.
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.Boolean"/> indicating whether the set was successful.
+		/// </returns>
+		private static void SetBSDProcessName (string name)
+		{
+			setproctitle ("%s", name);
+		}
+		
+		public override void SetProcessName (string name)
+		{
+			try {
+				if (!SetLinuxProcessName (name))
+					throw new ApplicationException ("Error setting process name: " + Stdlib.GetLastError ());
+			} catch (EntryPointNotFoundException) {
+				SetBSDProcessName (name);
+			}
+		}
 	}
 }

=== modified file 'Do.Platform/src/Do.Platform/AbstractSystemService.cs'
--- Do.Platform/src/Do.Platform/AbstractSystemService.cs	2009-05-19 04:37:27 +0000
+++ Do.Platform/src/Do.Platform/AbstractSystemService.cs	2009-08-08 20:41:29 +0000
@@ -49,5 +49,6 @@
 		{
 		}
 		
+		public abstract void SetProcessName (string name);
 	}
 }

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Default/DefaultSystemService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Default/DefaultSystemService.cs	2009-01-20 04:56:39 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Default/DefaultSystemService.cs	2009-08-08 20:41:29 +0000
@@ -37,5 +37,10 @@
 		{
 			Log<DefaultSystemService>.Debug ("Cannot EnsureSingleApplicationInstance");
 		}
+		
+		public override void SetProcessName (string name)
+		{
+			Log<DefaultSystemService>.Debug ("Cannot SetProcessName");
+		}
 	}
 }

=== modified file 'Do/Do.mdp'
--- Do/Do.mdp	2009-06-23 16:25:39 +0000
+++ Do/Do.mdp	2009-08-08 20:41:29 +0000
@@ -18,7 +18,6 @@
     <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.cs" subtype="Code" buildaction="Compile" />
     <File name="src/XKeybinder.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/Util.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.Core/ItemExtensions.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.Universe/InternalItemSource.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.Universe/ItemSourceItemSource.cs" subtype="Code" buildaction="Compile" />

=== modified file 'Do/Makefile.am'
--- Do/Makefile.am	2009-07-23 09:29:41 +0000
+++ Do/Makefile.am	2009-08-08 20:41:29 +0000
@@ -71,8 +71,7 @@
 	src/Do.cs \
 	src/Mono.Addins/AddinExtensions.cs \
 	src/Mono.Addins/Mono.Addins.Setup/AddinRepositoryEntryExtensions.cs \
-	src/PathExtensions.cs \
-	src/Util.cs
+	src/PathExtensions.cs
 
 RESOURCES = \
 	gtk-gui/gui.stetic \

=== modified file 'Do/src/Do.cs'
--- Do/src/Do.cs	2009-08-03 20:31:41 +0000
+++ Do/src/Do.cs	2009-08-08 20:41:29 +0000
@@ -62,9 +62,10 @@
 				Log.DisplayLevel = LogLevel.Debug;
 
 			try {
-				Util.SetProcessName ("gnome-do");
+				Services.System.SetProcessName ("gnome-do");
+				//Util.SetProcessName ("gnome-do");
 			} catch (Exception e) {
-				Log.Error ("Failed to set process name: {0}", e.Message);
+				Log.Error ("Failed to set process name: {0}.", e.Message);
 			}
 			
 			Controller.Initialize ();

=== removed file 'Do/src/Util.cs'
--- Do/src/Util.cs	2008-12-29 21:46:07 +0000
+++ Do/src/Util.cs	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/* Util.cs
- *
- * GNOME Do is the legal property of its developers. Please refer to the
- * COPYRIGHT file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-using System;
-using System.Text;
-using System.Runtime.InteropServices;
-
-using Mono.Unix.Native;
-
-namespace Do
-{
-
-	public static class Util
-	{
-		
-		[DllImport ("libc")] // Linux
-		private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5);
-		
-		private static int prctl (int option, byte [] arg2)
-		{
-			return prctl (option, arg2, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
-		}
-
-		private static int prctl (int option, string arg2)
-		{
-			return prctl (option, Encoding.ASCII.GetBytes (arg2 + "\0"));
-		}
-
-		[DllImport ("libc")] // BSD
-		private static extern void setproctitle (byte [] fmt, byte [] name);
-
-		private static void setproctitle (string fmt, string name)
-		{
-			setproctitle (Encoding.ASCII.GetBytes (fmt + "\0"), Encoding.ASCII.GetBytes (name + "\0"));
-		}
-
-		/// <summary>
-		/// Sets the name of the current process on Linux. Throws EntryPointNotFoundException
-		/// if we are not on Linux.
-		/// </summary>
-		/// <param name="name">
-		/// A <see cref="System.String"/> name to set the process name to.
-		/// </param>
-		/// <returns>
-		/// A <see cref="System.Boolean"/> indicating whether the set was successful.
-		/// </returns>
-		private static bool SetLinuxProcessName (string name)
-		{
-			return prctl (15 /* PR_SET_NAME */, name) == 0;
-		}
-
-		/// <summary>
-		/// Sets the name of the current process on BSD. Throws EntryPointNotFoundException
-		/// if we are not on BSD.
-		/// </summary>
-		/// <param name="name">
-		/// A <see cref="System.String"/> name to set the process name to.
-		/// </param>
-		/// <returns>
-		/// A <see cref="System.Boolean"/> indicating whether the set was successful.
-		/// </returns>
-		private static void SetBSDProcessName (string name)
-		{
-			setproctitle ("%s", name);
-		}
-
-		/// <summary>
-		/// Sets the name of the current process.
-		/// </summary>
-		/// <param name="name">
-		/// A <see cref="System.String"/> name to set the process name to.
-		/// </param>
-		public static void SetProcessName (string name)
-		{
-			try {
-				if (!SetLinuxProcessName (name))
-					throw new ApplicationException ("Error setting process name: " + Stdlib.GetLastError ());
-			} catch (EntryPointNotFoundException) {
-				SetBSDProcessName (name);
-			}
-		}
-	}
-}