[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[dotgnu-pnet-commits] pnetlib ChangeLog runtime/System/Resources/Reso...
|
From: |
Heiko Weiss |
|
Subject: |
[dotgnu-pnet-commits] pnetlib ChangeLog runtime/System/Resources/Reso... |
|
Date: |
Tue, 27 Nov 2007 13:08:04 +0000 |
CVSROOT: /sources/dotgnu-pnet
Module name: pnetlib
Changes by: Heiko Weiss <brubbel> 07/11/27 13:08:04
Modified files:
. : ChangeLog
runtime/System/Resources: ResourceManager.cs ResourceReader.cs
runtime/System/Threading: Timer.cs
Log message:
ResourceManager.cs: avoid calling the same methods twice.
ResourceReader.cs: do some speedups reading resources.
Timer.cs: fixed Timer bug with arguments of TimeSpan (thanks to
Weaselweb)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnetlib/ChangeLog?cvsroot=dotgnu-pnet&r1=1.2521&r2=1.2522
http://cvs.savannah.gnu.org/viewcvs/pnetlib/runtime/System/Resources/ResourceManager.cs?cvsroot=dotgnu-pnet&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pnetlib/runtime/System/Resources/ResourceReader.cs?cvsroot=dotgnu-pnet&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pnetlib/runtime/System/Threading/Timer.cs?cvsroot=dotgnu-pnet&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.2521
retrieving revision 1.2522
diff -u -b -r1.2521 -r1.2522
--- ChangeLog 19 Nov 2007 15:19:14 -0000 1.2521
+++ ChangeLog 27 Nov 2007 13:08:04 -0000 1.2522
@@ -1,3 +1,11 @@
+2007-11-27 Heiko Weiss <address@hidden>
+ * runtime/System/Resources/ResourceManager.cs: avoid calling the same
+ methods twice.
+ * runtime/System/Resources/ResourceReader.cs: do some speedups reading
+ resources.
+ * runtime/System/Threading/Timer.cs: fixed Timer bug with arguments of
+ TimeSpan (thanks to Weaselweb).
+
2007-11-19 Radek Polak <address@hidden>
* runtime/System/Private/DebuggerHelper.cs: Fix watching expressions
Index: runtime/System/Resources/ResourceManager.cs
===================================================================
RCS file:
/sources/dotgnu-pnet/pnetlib/runtime/System/Resources/ResourceManager.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- runtime/System/Resources/ResourceManager.cs 8 Jul 2004 00:18:01 -0000
1.18
+++ runtime/System/Resources/ResourceManager.cs 27 Nov 2007 13:08:04 -0000
1.19
@@ -229,9 +229,10 @@
(culture, true, true);
if(set != null)
{
- if(set.GetObject(name)
!= null)
+ Object ret =
set.GetObject(name);
+ if(ret != null)
{
- return
set.GetObject(name);
+ return ret;
}
}
culture = culture.Parent;
@@ -283,9 +284,10 @@
(culture, true, true);
if(set != null)
{
- if(set.GetString(name)
!= null)
+ String ret =
set.GetString(name);
+ if(ret != null)
{
- return
set.GetString(name);
+ return ret;
}
}
if(culture.Equals(CultureInfo.InvariantCulture))
Index: runtime/System/Resources/ResourceReader.cs
===================================================================
RCS file:
/sources/dotgnu-pnet/pnetlib/runtime/System/Resources/ResourceReader.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- runtime/System/Resources/ResourceReader.cs 30 Dec 2003 00:54:16 -0000
1.9
+++ runtime/System/Resources/ResourceReader.cs 27 Nov 2007 13:08:04 -0000
1.10
@@ -125,31 +125,12 @@
// Read a integer value byte by byte. Returns -1 if invalid.
private static int ReadInt(Stream stream)
{
- int value, byteval;
- byteval = stream.ReadByte();
- if(byteval == -1)
- {
- return -1;
- }
- value = byteval;
- byteval = stream.ReadByte();
- if(byteval == -1)
- {
- return -1;
- }
- value |= (byteval << 8);
- byteval = stream.ReadByte();
- if(byteval == -1)
+ byte [] data = new byte[4];
+ if(stream.Read(data, 0, 4) != 4)
{
return -1;
}
- value |= (byteval << 16);
- byteval = stream.ReadByte();
- if(byteval == -1)
- {
- return -1;
- }
- value |= (byteval << 24);
+ int value = data[0] | (data[1] << 8) | (data[2]
<< 16) | (data[3] << 24);
return value;
}
@@ -212,31 +193,12 @@
{
return null;
}
- length /= 2;
- if(length == 0)
- {
- return String.Empty;
- }
- StringBuilder builder = new
StringBuilder(length);
- int ch, byteval;
- while(length > 0)
- {
- byteval = stream.ReadByte();
- if(byteval == -1)
- {
- return null;
- }
- ch = byteval;
- byteval = stream.ReadByte();
- if(byteval == -1)
+ byte[] buf = new byte [length];
+ if(stream.Read(buf, 0, length) != length)
{
return null;
}
- ch |= (byteval << 8);
- builder.Append((char)ch);
- --length;
- }
- return builder.ToString();
+ return Encoding.Unicode.GetString(buf, 0,
length);
}
// Convert a string name into a type.
Index: runtime/System/Threading/Timer.cs
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/runtime/System/Threading/Timer.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- runtime/System/Threading/Timer.cs 19 Jan 2006 11:14:46 -0000 1.10
+++ runtime/System/Threading/Timer.cs 27 Nov 2007 13:08:04 -0000 1.11
@@ -172,7 +172,7 @@
public bool Change(TimeSpan dueTime, TimeSpan period)
{
- return Change(dueTime.Milliseconds,
period.Milliseconds);
+ return Change((long)dueTime.TotalMilliseconds,
(long)period.TotalMilliseconds);
}
#if !ECMA_COMPAT
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [dotgnu-pnet-commits] pnetlib ChangeLog runtime/System/Resources/Reso...,
Heiko Weiss <=