Nabble - Mono - Dev

[stringlength.diff]
Index: System/String.cs

===================================================================

--- System/String.cs	(revision 147553)

+++ System/String.cs	(working copy)

@@ -2479,25 +2479,6 @@

 			}

 		}

 

-		internal unsafe void InternalSetLength (int newLength)

-		{

-			if (newLength > length)

-				throw new ArgumentOutOfRangeException ("newLength", "newLength as to be <= length");

-

-			// zero terminate, we can pass string objects directly via pinvoke

-			// we also zero the rest of the string, since the new GC needs to be

-			// able to handle the changing size (it will skip the 0 bytes).

-			fixed (char * pStr = &start_char) {

-				char *p = pStr + newLength;

-				char *end = pStr + length;

-				while (p < end) {

-					p [0] = '\0';

-					p++;

-				}

-			}

-			length = newLength;

-		}

-

 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]

 		// When modifying it, GetCaseInsensitiveHashCode() should be modified as well.

 		public unsafe override int GetHashCode ()

Index: System.Text/StringBuilder.cs

===================================================================

--- System.Text/StringBuilder.cs	(revision 147553)

+++ System.Text/StringBuilder.cs	(working copy)

@@ -207,8 +207,7 @@

 			if (null != _cached_str)

 				return _cached_str;

 

-			// If we only have a half-full buffer we return a new string.

-			if (_length < (_str.Length >> 1)) 

+			if (_length != _str.Length)

 			{

 				// use String.SubstringUnchecked instead of String.Substring

 				// as the former is guaranteed to create a new string object

@@ -217,7 +216,6 @@

 			}

 

 			_cached_str = _str;

-			_str.InternalSetLength(_length);

 

 			return _str;

 		}


[dgettext.patch]
commit cb56e9c354235bc7226560b33b4f074d63a4dcb2

Author: Stephane Delcroix <stephane@...>

Date:   Thu Dec 3 12:43:43 2009 +0100


    2009-12-3  Stephane Delcroix  <stephane@...>

    

    	* Catalog.cs: P/Invoke d(n)gettext

diff --git a/class/Mono.Posix/Mono.Unix/Catalog.cs b/class/Mono.Posix/Mono.Unix/Catalog.cs

index d835fec..c79d49b 100644

--- a/class/Mono.Posix/Mono.Unix/Catalog.cs

+++ b/class/Mono.Posix/Mono.Unix/Catalog.cs

@@ -93,6 +93,9 @@ namespace Mono.Unix {

 	

 		[DllImport("intl")]

 		static extern IntPtr gettext (IntPtr instring);

+

+		[DllImport("intl")]

+		static extern IntPtr dgettext (IntPtr domain, IntPtr instring);

 		

 		public static String GetString (String s)

 		{

@@ -108,18 +111,39 @@ namespace Mono.Unix {

 				UnixMarshal.FreeHeap (ints);

 			}

 		}

+		

+		public static String GetString (String domain, String s)

+		{

+			IntPtr ints = UnixMarshal.StringToHeap (s);

+			IntPtr dom = UnixMarshal.StringToHeap (domain);

+			try {

+				// (d)gettext(3) returns the input pointer if no translation is found

+				IntPtr r = dgettext (dom, ints);

+				if (r != ints)

+					return UnixMarshal.PtrToStringUnix (r);

+				return s;

+			}

+			finally {

+				UnixMarshal.FreeHeap (dom);

+				UnixMarshal.FreeHeap (ints);

+			}

+		}

 	

 		[DllImport("intl")]

 		static extern IntPtr ngettext (IntPtr singular, IntPtr plural, Int32 n);

 		

-		public static String GetPluralString (String s, String p, Int32 n)

+		[DllImport("intl")]

+		static extern IntPtr dngettext (IntPtr domain, IntPtr singular, IntPtr plural, Int32 n);

+		

+		public static String GetPluralString (String domain, String s, String p, Int32 n)

 		{

 			IntPtr ints, intp, _ignore;

 			MarshalStrings (s, out ints, p, out intp, null, out _ignore);

+			IntPtr dom = UnixMarshal.StringToHeap (domain);

 

 			try {

-				// ngettext(3) returns an input pointer if no translation is found

-				IntPtr r = ngettext (ints, intp, n);

+				// (d)ngettext(3) returns an input pointer if no translation is found

+				IntPtr r = dngettext (dom, ints, intp, n);

 				if (r == ints)

 					return s;

 				if (r == intp)

@@ -129,6 +153,7 @@ namespace Mono.Unix {

 			finally {

 				UnixMarshal.FreeHeap (ints);

 				UnixMarshal.FreeHeap (intp);

+				UnixMarshal.FreeHeap (dom);

 			}

 		}

 	}

diff --git a/class/Mono.Posix/Mono.Unix/ChangeLog b/class/Mono.Posix/Mono.Unix/ChangeLog

index 3901ef4..463c07c 100644

--- a/class/Mono.Posix/Mono.Unix/ChangeLog

+++ b/class/Mono.Posix/Mono.Unix/ChangeLog

@@ -1,3 +1,7 @@

+2009-12-3  Stephane Delcroix  <stephane@...>

+

+	* Catalog.cs: P/Invoke d(n)gettext

+

 2009-03-23  Jonathan Pryor  <jpryor@...>

 

 	* UnixDriveInfo.cs: UnixDriveInfo.AvailableFreeSpace needs to return 


[dto.patch]
commit bbc1e860891c2b143eba543bb19bf966ab5c805e

Author: stephane <stephane@e3ebcda4-bce8-0310-ba0a-eca2169e7518>

Date:   Thu Dec 3 11:58:11 2009 +0000


    2009-12-03  Stephane Delcroix  <stephane@...>

    

    	* DateTimeOffset.cs: fix dates arithmetic to avoid throwing

    	while crossing dst boundaries.

    

    git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@147551 e3ebcda4-bce8-0310-ba0a-eca2169e7518


diff --git a/class/corlib/System/ChangeLog b/class/corlib/System/ChangeLog

index 5ccb57e..e951718 100644

--- a/class/corlib/System/ChangeLog

+++ b/class/corlib/System/ChangeLog

@@ -1,3 +1,8 @@

+2009-12-03  Stephane Delcroix  <stephane@...>

+

+	* DateTimeOffset.cs: fix dates arithmetic to avoid throwing

+	while crossing dst boundaries.

+

 2009-12-03  Jb Evain  <jbevain@...>

 

 	* Attribute.cs: remove code duplication.

diff --git a/class/corlib/System/DateTimeOffset.cs b/class/corlib/System/DateTimeOffset.cs

index c8e544c..ab6ec29 100644

--- a/class/corlib/System/DateTimeOffset.cs

+++ b/class/corlib/System/DateTimeOffset.cs

@@ -101,17 +101,17 @@ namespace System

 

 		public DateTimeOffset Add (TimeSpan timeSpan)

 		{

-			return new DateTimeOffset (dt.Add (timeSpan), utc_offset);

+			return new DateTimeOffset (dt.Add (timeSpan).Ticks, utc_offset);

 		}

 	

 		public DateTimeOffset AddDays (double days)

 		{

-			return new DateTimeOffset (dt.AddDays (days), utc_offset);	

+			return new DateTimeOffset (dt.AddDays (days).Ticks, utc_offset);	

 		}

 		

 		public DateTimeOffset AddHours (double hours)

 		{

-			return new DateTimeOffset (dt.AddHours (hours), utc_offset);

+			return new DateTimeOffset (dt.AddHours (hours).Ticks, utc_offset);

 		}

 

 		public static DateTimeOffset operator + (DateTimeOffset dateTimeTz, TimeSpan timeSpan)

@@ -121,32 +121,32 @@ namespace System

 

 		public DateTimeOffset AddMilliseconds (double milliseconds)

 		{

-			return new DateTimeOffset (dt.AddMilliseconds (milliseconds), utc_offset);

+			return new DateTimeOffset (dt.AddMilliseconds (milliseconds).Ticks, utc_offset);

 		}

 

 		public DateTimeOffset AddMinutes (double minutes)

 		{

-			return new DateTimeOffset (dt.AddMinutes (minutes), utc_offset);	

+			return new DateTimeOffset (dt.AddMinutes (minutes).Ticks, utc_offset);	

 		}

 

 		public DateTimeOffset AddMonths (int months)

 		{

-			return new DateTimeOffset (dt.AddMonths (months), utc_offset);

+			return new DateTimeOffset (dt.AddMonths (months).Ticks, utc_offset);

 		}

 

 		public DateTimeOffset AddSeconds (double seconds)

 		{

-			return new DateTimeOffset (dt.AddSeconds (seconds), utc_offset);

+			return new DateTimeOffset (dt.AddSeconds (seconds).Ticks, utc_offset);

 		}

 

 		public DateTimeOffset AddTicks (long ticks)

 		{

-			return new DateTimeOffset (dt.AddTicks (ticks), utc_offset);	

+			return new DateTimeOffset (dt.AddTicks (ticks).Ticks, utc_offset);	

 		}

 

 		public DateTimeOffset AddYears (int years)

 		{

-			return new DateTimeOffset (dt.AddYears (years), utc_offset);

+			return new DateTimeOffset (dt.AddYears (years).Ticks, utc_offset);

 		}

 

 		public static int Compare (DateTimeOffset first, DateTimeOffset second)

diff --git a/class/corlib/Test/System/DateTimeOffsetTest.cs b/class/corlib/Test/System/DateTimeOffsetTest.cs

index ec2b91f..24f9aa1 100644

--- a/class/corlib/Test/System/DateTimeOffsetTest.cs

+++ b/class/corlib/Test/System/DateTimeOffsetTest.cs

@@ -618,7 +618,16 @@ namespace MonoTests.System {

 			}

 			return result;

 		}

-

+		

+		[Test]

+		public void ArithmeticAccrossDSTBoudaries ()

+		{

+			DateTime dt = new DateTime (633954393584177800, DateTimeKind.Local); //Dec 3, 2009, 12:16

+			DateTimeOffset dto = new DateTimeOffset (dt);

+			DateTimeOffset dto2 = dto.AddDays (-60); //Should cross the late Oct boundary in most part of the world

+			Assert.AreEqual (dto.Offset, dto2.Offset);

+			Assert.AreEqual (dt.AddDays (-60), dto2.DateTime);

+		}

 	}

 }

 #endif


[fixed-version.patch]
Index: processes.c

===================================================================

--- processes.c	(revision 147470)

+++ processes.c	(working copy)

@@ -35,6 +35,12 @@

 #include <sys/resource.h>

 #endif

 

+#ifdef PLATFORM_MACOSX

+#include <sys/proc.h>

+#include <sys/sysctl.h>

+#include <sys/utsname.h>

+#endif

+

 #ifdef PLATFORM_SOLARIS

 /* procfs.h cannot be included if this define is set, but it seems to work fine if it is undefined */

 #if _FILE_OFFSET_BITS == 64

@@ -408,7 +414,6 @@

 }

 

 #ifdef PLATFORM_MACOSX

-#include <sys/utsname.h>

 

 /* 0 = no detection; -1 = not 10.5 or higher;  1 = 10.5 or higher */

 static int osx_10_5_or_higher;

@@ -1489,8 +1494,62 @@

 }

 #endif /* UNUSED_CODE */

 

+#ifdef PLATFORM_MACOSX

+

 gboolean EnumProcesses (guint32 *pids, guint32 len, guint32 *needed)

 {

+	guint32 count, fit, i, j;

+	gint32 err;

+	gboolean done;

+	struct kinfo_proc *result;

+	size_t proclength;

+	static const int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0 };

+	

+	mono_once (&process_current_once, process_set_current);

+	

+	result = NULL;

+	done = FALSE;

+	

+	do {

+		proclength = 0;

+		err = sysctl ((int *)name, (sizeof(name) / sizeof(*name)) - 1, NULL, &proclength, NULL, 0);

+

+		if (err == 0) {

+			result = malloc (proclength);

+			if (result == NULL)

+				return FALSE;

+			

+			err = sysctl ((int *) name, (sizeof(name) / sizeof(*name)) - 1, result, &proclength, NULL, 0);

+

+			if (err == 0) 

+				done = TRUE;

+			else

+				free (result);

+		}

+	} while (err == 0 && !done);

+	

+	if (err != 0) {

+ 		if (result != NULL) {

+			free (result);

+			result = NULL;

+		}

+		return(FALSE);

+	}	

+	

+	count = proclength / sizeof(struct kinfo_proc);

+	fit = len / sizeof(guint32);

+	for (i = 0, j = 0; j< fit && i < count; i++) {

+		pids [j++] = result [i].kp_proc.p_pid;

+	}

+	free (result);

+	result = NULL;

+	*needed = j * sizeof(guint32);

+	

+	return(TRUE);

+}

+#else

+gboolean EnumProcesses (guint32 *pids, guint32 len, guint32 *needed)

+{

 	GArray *processes = g_array_new (FALSE, FALSE, sizeof(pid_t));

 	guint32 fit, i, j;

 	DIR *dir;

@@ -1528,6 +1587,7 @@

 	

 	return(TRUE);

 }

+#endif

 

 static gboolean process_open_compare (gpointer handle, gpointer user_data)

 {

@@ -2050,9 +2110,28 @@

 	gchar *ret = NULL;

 	gchar buf[256];

 	FILE *fp;

-	

+

+#if defined(PLATFORM_SOLARIS)

+	filename = g_strdup_printf ("/proc/%d/psinfo", pid);

+	if ((fp = fopen (filename, "r")) != NULL) {

+		struct psinfo info;

+		int nread;

+

+		nread = fread (&info, sizeof (info), 1, fp);

+		if (nread == 1) {

+			ret = g_strdup (info.pr_fname);

+		}

+

+		fclose (fp);

+	}

+	g_free (filename);

+#elif defined(PLATFORM_MACOSX)

 	memset (buf, '\0', sizeof(buf));

-	

+	proc_name (pid, buf, sizeof(buf));

+	if (strlen (buf) > 0)

+		ret = g_strdup (buf);

+#else

+	memset (buf, '\0', sizeof(buf));

 	filename = g_strdup_printf ("/proc/%d/exe", pid);

 	if (readlink (filename, buf, 255) > 0) {

 		ret = g_strdup (buf);

@@ -2062,7 +2141,7 @@

 	if (ret != NULL) {

 		return(ret);

 	}

-	

+

 	filename = g_strdup_printf ("/proc/%d/cmdline", pid);

 	if ((fp = fopen (filename, "r")) != NULL) {

 		if (fgets (buf, 256, fp) != NULL) {

@@ -2096,25 +2175,6 @@

 		fclose (fp);

 	}

 	g_free (filename);

-

-	if (ret != NULL) {

-		return(ret);

-	}

-

-#ifdef PLATFORM_SOLARIS

-	filename = g_strdup_printf ("/proc/%d/psinfo", pid);

-	if ((fp = fopen (filename, "r")) != NULL) {

-		struct psinfo info;

-		int nread;

-

-		nread = fread (&info, sizeof (info), 1, fp);

-		if (nread == 1) {

-			ret = g_strdup (info.pr_fname);

-		}

-		

-		fclose (fp);

-	}

-	g_free (filename);

 #endif

 

 	if (ret != NULL) {



Nabble - Mono - Dev

Re: build fails on genmdesc

Re: build fails on genmdesc

build fails on genmdesc

Re: Getting rid of String.InternalSetLength

Re: Getting rid of String.InternalSetLength

Re: gmcs compiler error

Re: Need help building Mono under Snow Leopard

Re: Fix for ERROR : Opcode 'loadi8_memindex' missing for PPC64

gmcs compiler error

Fix for ERROR : Opcode 'loadi8_memindex' missing for PPC64

Need help building Mono under Snow Leopard

Re: [PATCH] Bind d(n)gettext in Mono.Unix.Catalog

Re: [PATCH] Bind d(n)gettext in Mono.Unix.Catalog

Getting rid of String.InternalSetLength

Re: Understanding & Resolving MoMA Issue Messages

Re: Understanding & Resolving MoMA Issue Messages

[PATCH] Bind d(n)gettext in Mono.Unix.Catalog

Re: DateTimeOffset Test and Patch

Re: Understanding & Resolving MoMA Issue Messages

Understanding & Resolving MoMA Issue Messages

Re: crashes while executing System.Buffer.BlockCopyInternal

Re: svn trunk, gmake check failed

svn trunk, gmake check failed

Pointers for using/branching HttpWebRequest

Re: Patch for Processes.c on Mac OSX

Re: Patch for Processes.c on Mac OSX

Re: Patch for Processes.c on Mac OSX

Re: Patch for Processes.c on Mac OSX

Re: DateTimeOffset Test and Patch

Re: How to improve Dataset Performance

Re: Patch for Processes.c on Mac OSX

Re: inlining and performance of SIMD code

Re: [PATCH] Use trampolines for vtable fixups (Windows) (updated)

Re: crashes while executing System.Buffer.BlockCopyInternal

Re: crashes while executing System.Buffer.BlockCopyInternal

Nabble - Mono - Dev

Re: build fails on genmdesc

Re: build fails on genmdesc

build fails on genmdesc

Re: Getting rid of String.InternalSetLength

Re: Getting rid of String.InternalSetLength

Re: gmcs compiler error

Re: Need help building Mono under Snow Leopard

Re: Fix for ** ERROR **: Opcode 'loadi8_memindex' missing for PPC64

gmcs compiler error

Fix for ** ERROR **: Opcode 'loadi8_memindex' missing for PPC64

Need help building Mono under Snow Leopard

Re: [PATCH] Bind d(n)gettext in Mono.Unix.Catalog

Re: [PATCH] Bind d(n)gettext in Mono.Unix.Catalog

Getting rid of String.InternalSetLength

Re: Understanding & Resolving MoMA Issue Messages

Re: Understanding & Resolving MoMA Issue Messages

[PATCH] Bind d(n)gettext in Mono.Unix.Catalog

Re: DateTimeOffset Test and Patch

Re: Understanding & Resolving MoMA Issue Messages

Understanding & Resolving MoMA Issue Messages

Re: crashes while executing System.Buffer.BlockCopyInternal

Re: svn trunk, gmake check failed

svn trunk, gmake check failed

Pointers for using/branching HttpWebRequest

Re: Patch for Processes.c on Mac OSX

Re: Patch for Processes.c on Mac OSX

Re: Patch for Processes.c on Mac OSX

Re: Patch for Processes.c on Mac OSX

Re: DateTimeOffset Test and Patch

Re: How to improve Dataset Performance

Re: Patch for Processes.c on Mac OSX

Re: inlining and performance of SIMD code

Re: [PATCH] Use trampolines for vtable fixups (Windows) (updated)

Re: crashes while executing System.Buffer.BlockCopyInternal

Re: crashes while executing System.Buffer.BlockCopyInternal

Re: Fix for ERROR : Opcode 'loadi8_memindex' missing for PPC64

Fix for ERROR : Opcode 'loadi8_memindex' missing for PPC64