Compare commits

...
16 Commits
Author SHA1 Message Date
Miguel de Icaza 14db55bb39 Update versions
svn path=/branches/mono-1-1-6/mcs/; revision=44310
2005-05-10 01:05:08 +00:00
Miguel de Icaza 25c4e4b71f Update versions
svn path=/branches/mono-1-1-6/mono/; revision=44310
2005-05-10 01:05:08 +00:00
Miguel de Icaza 58517d229b Revert exit patch
svn path=/branches/mono-1-1-6/mcs/; revision=44306
2005-05-09 21:42:36 +00:00
Miguel de Icaza 6f4efeeac3 Revert exit patch
svn path=/branches/mono-1-1-6/mono/; revision=44306
2005-05-09 21:42:36 +00:00
James Willcox 2f90fca6f8 merge in changes from trunk
svn path=/branches/mono-1-1-6/mcs/; revision=43798
2005-04-29 18:12:18 +00:00
Miguel de Icaza 7b80359550 Revert the Exit patches as they introduce 16 regressions alone, add amd64 fix
svn path=/branches/mono-1-1-6/mcs/; revision=43741
2005-04-28 19:42:31 +00:00
Miguel de Icaza e9501ede64 Revert the Exit patches as they introduce 16 regressions alone, add amd64 fix
svn path=/branches/mono-1-1-6/mono/; revision=43741
2005-04-28 19:42:31 +00:00
Miguel de Icaza 679cb2d0d1 For ZLM team
svn path=/branches/mono-1-1-6/mono/; revision=43692
2005-04-27 22:11:59 +00:00
Miguel de Icaza bacc147bb8 Exit patch
svn path=/branches/mono-1-1-6/mcs/; revision=43691
2005-04-27 22:11:04 +00:00
Miguel de Icaza 95253112e1 Exit patch
svn path=/branches/mono-1-1-6/mono/; revision=43691
2005-04-27 22:11:04 +00:00
Miguel de Icaza 6badf86766 other bits in 1.1.6 that were not commited
svn path=/branches/mono-1-1-6/mcs/; revision=43686
2005-04-27 20:54:42 +00:00
Miguel de Icaza 4a93eca61a Some from Sebastien
svn path=/branches/mono-1-1-6/mcs/; revision=42401
2005-03-30 22:48:26 +00:00
Miguel de Icaza af152d7dc9 Another one, this is from Gonzalo
svn path=/branches/mono-1-1-6/mcs/; revision=42397
2005-03-30 22:17:10 +00:00
Miguel de Icaza a0ee96d72e Another one
svn path=/branches/mono-1-1-6/mcs/; revision=42393
2005-03-30 21:58:16 +00:00
Miguel de Icaza 0512513cff Fixes for 1.1.6
svn path=/branches/mono-1-1-6/mcs/; revision=42391
2005-03-30 21:49:23 +00:00
Miguel de Icaza 972fb95152 For 1.1.6
svn path=/branches/mono-1-1-6/mono/; revision=42390
2005-03-30 21:47:50 +00:00
46 changed files with 326 additions and 77 deletions

No files matched your search

+1 -1
View File
@@ -86,7 +86,7 @@ Mon Feb 21 17:14:34 CET 2005 Paolo Molaro <[email protected]>
($(tmpinst)/bin/mono): Simplify.
(mcs-do-compiler-tests,mcs-compileall): Update.
* runtime/mono-wrapper.in: Use wrapper-config.
* Makefile.am (DIST_SUBDIRS): Sync with $(SUBDIRS).
* runtime/Makefile.am (verify_profiles): Remove.
+2 -2
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,1.1.5)
AM_INIT_AUTOMAKE(mono,1.1.6.2)
AM_MAINTAINER_MODE
AC_PROG_LN_S
@@ -1665,7 +1665,7 @@ runtime/Makefile
echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
echo "libdir=$libdir" >> $srcdir/$mcsdir/build/config.make
echo "mono_libdir=$exec_prefix/lib" >> $srcdir/$mcsdir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
)
+1 -1
View File
@@ -15,7 +15,7 @@
* btests: Removed. This directory is now superseded by
mbas/Test.
2004-12-13 Raja R Harinath <[email protected]>
* INSTALL.txt: Minor updates to reflect build changes.
+1 -1
View File
@@ -15,7 +15,7 @@ CFLAGS = -g -O2
INSTALL = /usr/bin/install
prefix = /usr/local
exec_prefix = $(prefix)
libdir = $(exec_prefix)/lib
mono_libdir = $(exec_prefix)/lib
RUNTIME = mono $(RUNTIME_FLAGS)
TEST_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
+1 -1
View File
@@ -35,7 +35,7 @@ install-local uninstall-local:
else
ifndef PROGRAM_INSTALL_DIR
PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION)
PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
endif
install-local: $(PROGRAM) $(PROGRAM_config)
+4 -4
View File
@@ -92,12 +92,12 @@ SNFLAGS = -q -R
endif
ifeq ($(PLATFORM), win32)
GACDIR = `cygpath -w $(libdir)`
GACROOT = `cygpath -w $(DESTDIR)$(libdir)`
GACDIR = `cygpath -w $(mono_libdir)`
GACROOT = `cygpath -w $(DESTDIR)$(mono_libdir)`
test_flags += -d:WINDOWS
else
GACDIR = $(libdir)
GACROOT = $(DESTDIR)$(libdir)
GACDIR = $(mono_libdir)
GACROOT = $(DESTDIR)$(mono_libdir)
endif
all-local: $(the_lib)
@@ -1,3 +1,13 @@
2005-03-18 Gonzalo Paniagua Javier <[email protected]>
* Tds70.cs: turns out that sp_reset_connection procedure might not be
found ("Invalid object name 'sp_reset_connection'"). In this case, and
if we get a proper state ('Class' property in the SqlException), just
ignore the error.
* TdsConnectionPool.cs: if the connection cannot be reset, attemp to
disconnect it before losing the last reference to it.
2005-03-11 Gonzalo Paniagua Javier <[email protected]>
* Tds.cs: set the charset for MS SQL 2000. Patch from Aleksandar
@@ -353,16 +353,19 @@ namespace Mono.Data.Tds.Protocol {
public override bool Reset ()
{
try
{
try {
ExecProc ("exec sp_reset_connection");
return true;
}
catch
{
Console.WriteLine ("Error reseting");
return false;
} catch (Exception e) {
System.Reflection.PropertyInfo pinfo = e.GetType ().GetProperty ("Class");
if (pinfo != null && pinfo.PropertyType == typeof (byte)) {
byte klass = (byte) pinfo.GetValue (e, null);
// 11 to 16 indicates error that can be fixed by the user such as 'Invalid object name'
if (klass < 11 || klass > 16)
return false;
}
}
return true;
}
public override void ExecPrepared (string commandText, TdsMetaParameterCollection parameters, int timeout, bool wantResults)
@@ -131,6 +131,9 @@ namespace Mono.Data.Tds.Protocol
connection = (ITds) list [list.Count - 1];
list.RemoveAt (list.Count - 1);
if (!connection.Reset ()) {
try {
connection.Disconnect ();
} catch {}
connection = null;
continue;
}
@@ -1,3 +1,8 @@
2005-03-30 Sebastien Pouliot <[email protected]>
* SymmetricTransform.cs: Fixed a padding bug affecting that can occurs
when no padding is used.
2005-03-07 Sebastien Pouliot <[email protected]>
* MD2Managed.cs: Removed memory allocation from the transform method.
@@ -414,7 +414,8 @@ namespace Mono.Security.Cryptography {
lastBlock = false;
}
byte padding = res [total - 1];
// total may be 0 (e.g. PaddingMode.None)
byte padding = ((total > 0) ? res [total - 1] : (byte) 0);
switch (algo.Padding) {
#if NET_2_0
case PaddingMode.ANSIX923:
@@ -1,3 +1,8 @@
2005-03-23 Gonzalo Paniagua Javier <[email protected]>
* HttpCookieCollection.cs: when adding more than one cookie with the
same name, the last one is the winner.
2005-03-09 Gonzalo Paniagua Javier <[email protected]>
* HttpRequest.cs: correctly store the value cookies in Params. Fixes
@@ -77,7 +77,10 @@ namespace System.Web
_AllCookies = null;
_AllKeys = null;
BaseAdd (cookie.Name, cookie);
if (BaseGet (cookie.Name) == null)
BaseAdd (cookie.Name, cookie);
else
BaseSet (cookie.Name, cookie);
if (null != _Response)
_Response.OnCookieAdd (cookie);
+4
View File
@@ -1,3 +1,7 @@
2005-03-30 Geoff Norton <[email protected]>
* KeventWatcher.cs: Fix a file handle leak on raised events.
2005-02-10 Lluis Sanchez Gual <[email protected]>
* DefaultWatcher.cs: Fix nullref exception when the object is disposed
+2 -1
View File
@@ -227,7 +227,8 @@ namespace System.IO {
if (haveEvents > 0) {
// Restart monitoring
KeventData data = (KeventData) requests [ev.ident];
StartMonitoringDirectory(data);
StopMonitoringDirectory (data);
StartMonitoringDirectory (data);
ProcessEvent (ev);
} else {
System.Threading.Thread.Sleep (500);
+11
View File
@@ -1,3 +1,14 @@
2005-03-30 Gonzalo Paniagua Javier <[email protected]>
* WebConnection.cs: we don't need to trigger the next queued request
until the response is closed.
2005-03-29 Miguel de Icaza <[email protected]>
* HttpWebResponse.cs: Handle quotations in the cookies values, per
the spec http://www.faqs.org/rfcs/rfc2109.html, it is allowed to
have quotations.
2005-03-18 Gonzalo Paniagua Javier <[email protected]>
* BasicClient.cs:
@@ -82,7 +82,7 @@ namespace System.Net
int pos = SearchCookie (cookie);
if (pos == -1)
list.Add (cookie);
else
else
list [pos] = cookie;
}
@@ -94,6 +94,9 @@ namespace System.Net
for (int i = list.Count - 1; i >= 0; i--) {
Cookie c = (Cookie) list [i];
if (c.Version != cookie.Version)
continue;
if (0 != String.Compare (domain, c.Domain, true, CultureInfo.InvariantCulture))
continue;
@@ -140,7 +140,7 @@ namespace System.Net
throw new CookieException ("Capacity exceeded");
cookies.Add (cookie);
count++;
count = cookies.Count;
}
}
@@ -265,7 +265,7 @@ namespace System.Net
continue;
if (path [path.Length - 1] != '/' && uripath.Length > path.Length &&
path [path.Length] != '/')
uripath [path.Length] != '/')
continue;
}
}
@@ -1023,7 +1023,7 @@ namespace System.Net
WebException wexc = null;
try {
webResponse = new HttpWebResponse (actualUri, method, data, (cookieContainer != null));
webResponse = new HttpWebResponse (actualUri, method, data, cookieContainer);
haveResponse = true;
} catch (Exception e) {
wexc = new WebException (e.Message, e, WebExceptionStatus.ProtocolError, null);
+23 -6
View File
@@ -52,13 +52,14 @@ namespace System.Net
string statusDescription;
long contentLength = -1;
string contentType;
CookieContainer cookieContainer;
bool disposed = false;
Stream stream;
// Constructors
internal HttpWebResponse (Uri uri, string method, WebConnectionData data, bool cookiesSet)
internal HttpWebResponse (Uri uri, string method, WebConnectionData data, CookieContainer container)
{
this.uri = uri;
this.method = method;
@@ -67,7 +68,8 @@ namespace System.Net
statusCode = (HttpStatusCode) data.StatusCode;
statusDescription = data.StatusDescription;
stream = data.stream;
if (cookiesSet) {
if (container != null) {
this.cookieContainer = container;
FillCookies ();
} else if (webHeaders != null) {
webHeaders.RemoveInternal ("Set-Cookie");
@@ -408,6 +410,8 @@ namespace System.Net
cookie.Domain = uri.Host;
cookieCollection.Add (cookie);
if (cookieContainer != null)
cookieContainer.Add (uri, cookie);
}
void SetCookie2 (string cookies_str)
@@ -477,11 +481,24 @@ namespace System.Net
while (k < length && Char.IsWhiteSpace (header [k]))
k++;
int begin = k;
while (k < length && header [k] != ';')
k++;
int begin;
if (header [k] == '"'){
int j;
begin = ++k;
pos = k;
while (k < length && header [k] != '"')
k++;
for (j = k; j < length && header [j] != ';'; j++)
;
pos = j;
} else {
begin = k;
while (k < length && header [k] != ';')
k++;
pos = k;
}
return header.Substring (begin, k - begin).Trim ();
}
}
@@ -375,7 +375,6 @@ namespace System.Net
if (!ExpectContent (data.StatusCode))
stream.ForceCompletion ();
stream.CheckComplete ();
data.request.SetResponseData (data);
}
+1 -1
View File
@@ -19,7 +19,7 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes
# disable, until people fix their code...
#corlib_flags = /unsafe /nostdlib /d:INSIDE_CORLIB
LIBRARY_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION)
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
CLEAN_FILES = $(cmplib) $(reslib) $(plattestlib) $(plattestlib).sources \
$(cmp_response) $(cmp_makefrag) \
@@ -1,3 +1,8 @@
2005-03-30 Sebastien Pouliot <[email protected]>
* SymmetricTransform.cs: Fixed a padding bug affecting that can occurs
when no padding is used.
2005-01-11 Sebastien Pouliot <[email protected]>
* DSAManaged.cs: PublicOnly now reports false when a key hasn't yet
@@ -414,7 +414,8 @@ namespace Mono.Security.Cryptography {
lastBlock = false;
}
byte padding = res [total - 1];
// total may be 0 (e.g. PaddingMode.None)
byte padding = ((total > 0) ? res [total - 1] : (byte) 0);
switch (algo.Padding) {
#if NET_2_0
case PaddingMode.ANSIX923:
@@ -82,6 +82,7 @@ namespace System.Threading
private IntPtr appdomain_refs;
private bool interruption_requested;
private IntPtr suspend_event;
private IntPtr suspended_event;
private IntPtr resume_event;
private object synch_lock = new Object();
private IntPtr serialized_culture_info;
+1 -1
View File
@@ -1,7 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("1.1.5")]
[assembly: AssemblyVersion("1.1.6.2")]
[assembly: AssemblyTitle ("Mono ILasm Compiler")]
[assembly: AssemblyDescription ("Mono ILasm Compiler")]
[assembly: AssemblyCopyright ("Sergey Chaban and Jackson Harper")]
+1 -1
View File
@@ -1,7 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("1.1.5")]
[assembly: AssemblyVersion("1.1.6.2")]
[assembly: AssemblyTitle ("Mono C# Compiler")]
[assembly: AssemblyDescription ("Mono C# Compiler")]
[assembly: AssemblyCopyright ("2001, 2002, 2003 Ximian, Inc.")]
+1 -1
View File
@@ -21,7 +21,7 @@ CORCOMPARE_SOURCES = \
MissingType.cs \
ToDoAssembly.cs
PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION)
PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
APIINFO_SOURCES = mono-api-info.cs
APIDIFF_SOURCES = mono-api-diff.cs
+21
View File
@@ -1,3 +1,24 @@
2005-04-28 James Willcox <[email protected]>
* mkbundle.cs: Add --config-dir option
* template.c: same
2005-04-25 Gonzalo Paniagua Javier <[email protected]>
* mkbundle.cs: GetReferencedAssemblies () will not report CodeBase, so
load the assembly and get it from there. Fixes bug #74695.
2004-04-09 James Willcox <[email protected]>
* template.c: allocate the correct amount of memory for newargs
2005-04-08 Miguel de Icaza <[email protected]>
* mkbundle.cs: Add support for bundling also a machine.config
2004-04-08 James Willcox <[email protected]>
* mkbundle.cs: add a --static flag for statically linking to libmono
Wed Mar 16 18:11:47 CET 2005 Paolo Molaro <[email protected]>
+85 -18
View File
@@ -23,6 +23,9 @@ class MakeBundle {
static bool autodeps = false;
static bool keeptemp = false;
static bool compile_only = false;
static bool static_link = false;
static string config_file = null;
static string config_dir = null;
static int Main (string [] args)
{
@@ -32,7 +35,7 @@ class MakeBundle {
for (int i = 0; i < top; i++){
switch (args [i]){
case "-h":
case "--help": case "-h": case "-?":
Help ();
return 1;
@@ -61,7 +64,7 @@ class MakeBundle {
Help ();
return 1;
}
link_paths.Add (args [i]);
link_paths.Add (args [++i]);
break;
case "--nodeps":
@@ -75,7 +78,25 @@ class MakeBundle {
case "--keeptemp":
keeptemp = true;
break;
case "--static":
static_link = true;
break;
case "--config":
if (i+1 == top) {
Help ();
return 1;
}
config_file = args [++i];
break;
case "--config-dir":
if (i+1 == top) {
Help ();
return 1;
}
config_dir = args [++i];
break;
default:
sources.Add (args [i]);
break;
@@ -164,11 +185,11 @@ class MakeBundle {
c_bundle_names.Add ("assembly_bundle_" + encoded);
try {
FileStream config_file = File.OpenRead (fname + ".config");
FileStream cf = File.OpenRead (fname + ".config");
Console.WriteLine (" config from: " + fname + ".config");
tc.WriteLine ("extern const unsigned char assembly_config_{0} [];", encoded);
WriteSymbol (ts, "assembly_config_" + encoded, config_file.Length);
while ((n = config_file.Read (buffer, 0, 8192)) != 0){
WriteSymbol (ts, "assembly_config_" + encoded, cf.Length);
while ((n = cf.Read (buffer, 0, 8192)) != 0){
for (int i = 0; i < n; i++){
ts.Write ("\t.byte {0}\n", buffer [i]);
}
@@ -178,8 +199,32 @@ class MakeBundle {
} catch (FileNotFoundException) {
/* we ignore if the config file doesn't exist */
}
}
if (config_file != null){
FileStream conf;
try {
conf = File.OpenRead (config_file);
} catch {
Error (String.Format ("Failure to open {0}", config_file));
return;
}
Console.WriteLine ("System config from: " + config_file);
tc.WriteLine ("extern const unsigned char system_config;");
WriteSymbol (ts, "system_config", config_file.Length);
int n;
while ((n = conf.Read (buffer, 0, 8192)) != 0){
for (int i = 0; i < n; i++){
ts.Write ("\t.byte {0}\n", buffer [i]);
}
}
// null terminator
ts.Write ("\t.byte 0\n");
ts.WriteLine ();
}
ts.Close ();
Console.WriteLine ("Compiling:");
string cmd = String.Format ("as -o {0} {1} ", temp_o, temp_s);
Console.WriteLine (cmd);
@@ -200,7 +245,14 @@ class MakeBundle {
foreach (string[] ass in config_names){
tc.WriteLine ("\tmono_register_config_for_assembly (\"{0}\", assembly_config_{1});\n", ass [0], ass [1]);
}
if (config_file != null)
tc.WriteLine ("\tmono_config_parse_memory (&system_config);\n");
tc.WriteLine ("}\n");
if (config_dir != null)
tc.WriteLine ("static const char *config_dir = \"{0}\";", config_dir);
else
tc.WriteLine ("static const char *config_dir = NULL;");
StreamReader s = new StreamReader (Assembly.GetAssembly (typeof(MakeBundle)).GetManifestResourceStream ("template.c"));
tc.Write (s.ReadToEnd ());
@@ -208,9 +260,19 @@ class MakeBundle {
if (compile_only)
return;
cmd = String.Format ("cc -o {2} -Wall {0} `pkg-config --cflags --libs mono` {1}",
temp_c, temp_o, output);
if (static_link)
cmd = String.Format ("cc -o {2} -Wall `pkg-config --cflags mono` {0} " +
"`pkg-config --libs-only-L mono` -Wl,-Bstatic " +
"`pkg-config --libs-only-l mono | sed -e \"s/\\-lm //\" | " +
"sed -e \"s/\\-ldl //\" | sed -e \"s/\\-lpthread //\"` " +
"-Wl,-Bdynamic -ldl -lm -lrt {1}",
temp_c, temp_o, output);
else
cmd = String.Format ("cc -o {2} -Wall {0} `pkg-config --cflags --libs mono` {1}",
temp_c, temp_o, output);
Console.WriteLine (cmd);
ret = system (cmd);
if (ret != 0){
@@ -264,8 +326,10 @@ class MakeBundle {
if (!autodeps)
return;
foreach (AssemblyName an in a.GetReferencedAssemblies ())
QueueAssembly (files, an.CodeBase);
foreach (AssemblyName an in a.GetReferencedAssemblies ()) {
a = Assembly.Load (an);
QueueAssembly (files, a.CodeBase);
}
}
static Assembly LoadAssembly (string assembly)
@@ -322,13 +386,16 @@ class MakeBundle {
{
Console.WriteLine ("Usage is: mkbundle [options] assembly1 [assembly2...]\n\n" +
"Options:\n" +
" -c Produce stub only, do not compile\n" +
" -o out Specifies output filename\n" +
" -oo obj Specifies output filename for helper object file" +
" -L path Adds `path' to the search path for assemblies\n" +
" --nodeps Turns off automatic dependency embedding (default)\n" +
" --deps Turns on automatic dependency embedding\n" +
" --keeptemp Keeps the temporary files\n");
" -c Produce stub only, do not compile\n" +
" -o out Specifies output filename\n" +
" -oo obj Specifies output filename for helper object file\n" +
" -L path Adds `path' to the search path for assemblies\n" +
" --nodeps Turns off automatic dependency embedding (default)\n" +
" --deps Turns on automatic dependency embedding\n" +
" --keeptemp Keeps the temporary files\n" +
" --config F Bundle system config file `F'\n" +
" --config-dir D Set MONO_CFG_DIR to `D'\n" +
" --static Statically link to mono libs\n");
}
[DllImport ("libc")]
+5 -1
View File
@@ -1,10 +1,11 @@
int mono_main (int argc, char* argv[]);
#include <stdlib.h>
#include <malloc.h>
int main (int argc, char* argv[])
{
char **newargs = (char **) malloc (sizeof (char *) * argc + 2);
char **newargs = (char **) malloc (sizeof (char *) * (argc + 2));
int i;
newargs [0] = argv [0];
@@ -12,6 +13,9 @@ int main (int argc, char* argv[])
for (i = 1; i < argc; i++)
newargs [i+1] = argv [i];
newargs [++i] = NULL;
if (config_dir != NULL && getenv ("MONO_CFG_DIR") == NULL)
setenv ("MONO_CFG_DIR", config_dir, 1);
install_dll_config_files ();
mono_register_bundled_assemblies(bundled);
+1 -1
View File
@@ -8,7 +8,7 @@ LOCAL_MCS_FLAGS = /lib:$(topdir)/class/lib/$(PROFILE) /r:Mono.Security.dll
SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe MakeCert.exe chktrust.exe signcode.exe setreg.exe certmgr.exe caspol.exe permview.exe
SECURITY_SOURCES = AssemblyInfo.cs StrongNameManager.cs $(SECURITY_PROGRAMS:.exe=.cs)
PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION)
PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
DISTFILES = README $(SECURITY_SOURCES)
+1 -1
View File
@@ -10,7 +10,7 @@ confdir = `cygpath -m "${sysconfdir}"`
AM_CFLAGS = -O
PLATFORM_LIB = ../os/libmonoos.la
else
assembliesdir = $(libdir)
assembliesdir = $(exec_prefix)/lib
confdir = $(sysconfdir)
endif
+2
View File
@@ -13,6 +13,8 @@
#include <string.h>
#include <errno.h>
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
/* On solaris, curses.h must come before both termios.h and term.h */
#ifdef HAVE_CURSES_H
+1
View File
@@ -239,6 +239,7 @@ struct _MonoThread {
GSList *appdomain_refs;
MonoBoolean interruption_requested;
gpointer suspend_event;
gpointer suspended_event;
gpointer resume_event;
MonoObject *synch_lock;
guint8* serialized_culture_info;
+3 -3
View File
@@ -6580,8 +6580,9 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const char *data, guin
return NULL;
/*g_print ("got attr %s\n", method->klass->name);*/
params = g_new (void*, mono_method_signature (method)->param_count);
/* Allocate using alloca so it gets GC tracking */
params = alloca (mono_method_signature (method)->param_count * sizeof (void*));
/* skip prolog */
p += 2;
@@ -6593,7 +6594,6 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const char *data, guin
attr = mono_object_new (mono_domain_get (), method->klass);
mono_runtime_invoke (method, attr, params, NULL);
free_param_data (method->signature, params);
g_free (params);
num_named = read16 (named);
named += 2;
for (j = 0; j < num_named; j++) {
+76 -13
View File
@@ -1798,13 +1798,22 @@ void mono_thread_abort_all_other_threads (void)
LeaveCriticalSection (&threads_mutex);
}
static void suspend_thread (gpointer key, gpointer value, gpointer user)
static void
collect_threads (gpointer key, gpointer value, gpointer user_data)
{
MonoThread *thread=(MonoThread *)value;
guint32 self=GPOINTER_TO_UINT (user);
if ((thread->tid!=self) && !mono_gc_is_finalizer_thread (thread))
SuspendThread (thread->handle);
MonoThread *thread = (MonoThread*)value;
struct wait_data *wait = (struct wait_data*)user_data;
HANDLE handle;
if (wait->num<MAXIMUM_WAIT_OBJECTS) {
handle = OpenThread (THREAD_ALL_ACCESS, TRUE, thread->tid);
if (handle == NULL)
return;
wait->handles [wait->num] = handle;
wait->threads [wait->num] = thread;
wait->num++;
}
}
/*
@@ -1814,12 +1823,64 @@ static void suspend_thread (gpointer key, gpointer value, gpointer user)
*/
void mono_thread_suspend_all_other_threads (void)
{
guint32 self=GetCurrentThreadId ();
struct wait_data *wait = g_new0 (struct wait_data, 1);
int i, waitnum;
guint32 self = GetCurrentThreadId ();
EnterCriticalSection (&threads_mutex);
mono_g_hash_table_foreach (threads, suspend_thread,
GUINT_TO_POINTER (self));
LeaveCriticalSection (&threads_mutex);
do {
/*
* Make a copy of the hashtable since we can't do anything with
* threads while threads_mutex is held.
*/
EnterCriticalSection (&threads_mutex);
mono_g_hash_table_foreach (threads, collect_threads, wait);
LeaveCriticalSection (&threads_mutex);
waitnum = 0;
for (i = 0; i < wait->num; ++i) {
MonoThread *thread = wait->threads [i];
if ((thread->tid == self) || mono_gc_is_finalizer_thread (thread)) {
//CloseHandle (wait->handles [i]);
continue;
}
mono_monitor_enter (thread->synch_lock);
if ((thread->state & ThreadState_Suspended) != 0 ||
(thread->state & ThreadState_SuspendRequested) != 0 ||
(thread->state & ThreadState_StopRequested) != 0 ||
(thread->state & ThreadState_Stopped) != 0) {
mono_monitor_exit (thread->synch_lock);
CloseHandle (wait->handles [i]);
continue;
}
thread->state |= ThreadState_SuspendRequested;
//printf ("S: %d\n", thread->state);
thread->suspended_event = CreateEvent (NULL, TRUE, FALSE, NULL);
mono_monitor_exit (thread->synch_lock);
/* Signal the thread to suspend */
signal_thread_state_change (thread);
/* Wait for it to become suspended */
//printf ("W1\n");
WaitForSingleObject (thread->suspended_event, INFINITE);
//printf ("W2\n");
CloseHandle (thread->suspended_event);
thread->suspended_event = NULL;
CloseHandle (wait->handles [i]);
waitnum ++;
}
} while (waitnum > 0);
g_free (wait);
}
/*
@@ -2267,6 +2328,8 @@ static MonoException* mono_thread_execute_interruption (MonoThread *thread)
thread->state &= ~ThreadState_SuspendRequested;
thread->state |= ThreadState_Suspended;
thread->suspend_event = CreateEvent (NULL, TRUE, FALSE, NULL);
if (thread->suspended_event)
SetEvent (thread->suspended_event);
mono_monitor_exit (thread->synch_lock);
WaitForSingleObject (thread->suspend_event, INFINITE);
@@ -2328,7 +2391,7 @@ MonoException* mono_thread_request_interruption (gboolean running_managed)
thread->interruption_requested = TRUE;
mono_monitor_exit (thread->synch_lock);
/* this will awake the thread if it is in WaitForSingleObject
or similar */
QueueUserAPC (dummy_apc, thread->handle, NULL);
@@ -2357,7 +2420,7 @@ static void mono_thread_interruption_checkpoint_request (gboolean bypass_abort_p
MonoThread *thread = mono_thread_current ();
/* The thread may already be stopping */
if (thread == NULL)
if (thread == NULL)
return;
if (thread->interruption_requested && (bypass_abort_protection || !is_running_protected_wrapper ())) {
+3
View File
@@ -199,6 +199,7 @@ arch_get_restore_context (void)
ppc_break (code);
g_assert ((code - start) < sizeof(start));
mono_arch_flush_icache (start, code - start);
return start;
}
@@ -268,6 +269,7 @@ arch_get_call_filter (void)
ppc_blr (code);
g_assert ((code - start) < sizeof(start));
mono_arch_flush_icache (start, code - start);
return start;
}
@@ -371,6 +373,7 @@ mono_arch_get_throw_exception_generic (guint8 *start, int size, int by_name, gbo
/* we should never reach this breakpoint */
ppc_break (code);
g_assert ((code - start) < size);
mono_arch_flush_icache (start, code - start);
return start;
}
+13
View File
@@ -1286,6 +1286,19 @@ emit_call (MonoCompile *cfg, guint8 *code, guint32 patch_type, gconstpointer dat
/* The callee might be an AOT method */
near_call = FALSE;
}
if (patch_type == MONO_PATCH_INFO_INTERNAL_METHOD) {
/*
* The call might go directly to a native function without
* the wrapper.
*/
MonoJitICallInfo *mi = mono_find_jit_icall_by_name (data);
if (mi) {
gconstpointer target = mono_icall_get_wrapper (mi);
if ((((guint64)target) >> 32) != 0)
near_call = FALSE;
}
}
}
else {
if (mono_find_class_init_trampoline_by_addr (data))
+1 -1
View File
@@ -341,7 +341,7 @@ mono_arch_flush_icache (guint8 *code, gint size)
#define FP_ALSO_IN_REG(s) s
#else
#define ALWAYS_ON_STACK(s)
#define FP_ALSO_IN_REG(s) s
#define FP_ALSO_IN_REG(s)
#define ALIGN_DOUBLES
#endif
+2
View File
@@ -4186,12 +4186,14 @@ mono_arch_emit_prolog (MonoCompile *cfg)
x86_branch8 (code, X86_CC_NE, 0, 0);
x86_push_imm (code, cfg->domain);
code = emit_call (cfg, code, MONO_PATCH_INFO_INTERNAL_METHOD, (gpointer)"mono_jit_thread_attach");
x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4);
x86_patch (buf, code);
}
else {
g_assert (!cfg->compile_aot);
x86_push_imm (code, cfg->domain);
code = emit_call (cfg, code, MONO_PATCH_INFO_INTERNAL_METHOD, (gpointer)"mono_jit_thread_attach");
x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4);
}
}
+1
View File
@@ -537,6 +537,7 @@ mono_debugger_create_notification_function (gpointer *notification_address)
if (notification_address)
*notification_address = buf;
ppc_blr (buf);
mono_arch_flush_icache (ptr, buf - ptr);
return ptr;
}
+2 -2
View File
@@ -53,8 +53,8 @@ mono_one_instdir = $(shell cygpath -m $(libdir))/mono/1.0
mono_two_instdir = $(shell cygpath -m $(libdir))/mono/2.0
else
plat_bindir = $(bindir)
mono_one_instdir = $(libdir)/mono/1.0
mono_two_instdir = $(libdir)/mono/2.0
mono_one_instdir = $(prefix)/lib/mono/1.0
mono_two_instdir = $(prefix)/lib/mono/2.0
endif
REWRITE = sed \