summaryrefslogtreecommitdiffstats
path: root/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch
blob: 9cff3ac3daee3678ddf8d76de2b3ae864bd5a165 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
Index: Mono.Debugging.Server.Mdb/DebuggerServer.cs
===================================================================
--- Mono.Debugging.Server.Mdb/DebuggerServer.cs	(revision 136420)
+++ Mono.Debugging.Server.Mdb/DebuggerServer.cs	(revision 136421)
@@ -39,6 +39,7 @@
 		Dictionary<int, ST.WaitCallback> breakUpdates = new Dictionary<int,ST.WaitCallback> ();
 		bool breakUpdateEventsQueued;
 		
+		MdbAdaptor mdbAdaptor;
 		AsyncEvaluationTracker asyncEvaluationTracker;
 		RuntimeInvokeManager invokeManager;
 
@@ -51,6 +52,7 @@
 		public DebuggerServer (IDebuggerController dc)
 		{
 			this.controller = dc;
+			
 			MarshalByRefObject mbr = (MarshalByRefObject)controller;
 			ILease lease = mbr.GetLifetimeService() as ILease;
 			lease.Register(this);
@@ -79,8 +81,18 @@
 			}
 		}
 
+		public MdbAdaptor MdbAdaptor {
+			get { return mdbAdaptor; }
+		}
+
 		#region IDebugger Members
 
+		public string InitializeMdb (string mdbVersion)
+		{
+			mdbAdaptor = MdbAdaptorFactory.CreateAdaptor (mdbVersion);
+			return mdbAdaptor.MdbVersion;
+		}
+
 		public void Run (DL.DebuggerStartInfo startInfo)
 		{
 			try {
@@ -91,6 +103,7 @@
 
 				DebuggerConfiguration config = new DebuggerConfiguration ();
 				config.LoadConfiguration ();
+				mdbAdaptor.InitializeConfiguration (config);
 				debugger = new MD.Debugger (config);
 				
 				debugger.ModuleLoadedEvent += OnModuleLoadedEvent;
Index: Mono.Debugging.Server.Mdb/MdbAdaptor.cs
===================================================================
--- Mono.Debugging.Server.Mdb/MdbAdaptor.cs	(revision 0)
+++ Mono.Debugging.Server.Mdb/MdbAdaptor.cs	(revision 136421)
@@ -0,0 +1,62 @@
+// 
+// MdbAdaptor.cs
+//  
+// Author:
+//       Lluis Sanchez Gual <lluis@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MDB=Mono.Debugger;
+using Mono.Debugging.Backend.Mdb;
+
+namespace DebuggerServer
+{
+	public abstract class MdbAdaptor
+	{
+		public MdbAdaptor ()
+		{
+			MdbVersion = "2.0";
+		}
+		
+		public string MdbVersion { get; internal set; }
+		
+		public virtual void SetupXsp (MDB.DebuggerConfiguration config)
+		{
+			ThrowNotSupported ("ASP.NET debugging not supported");
+		}
+		
+		public virtual void InitializeBreakpoint (MDB.SourceBreakpoint bp)
+		{
+		}
+		
+		public virtual void InitializeConfiguration (MDB.DebuggerConfiguration config)
+		{
+		}
+		
+		public abstract void AbortThread (MDB.Thread thread, MDB.RuntimeInvokeResult result);
+		
+		public void ThrowNotSupported (string feature)
+		{
+			throw new InvalidOperationException (feature + ". You need to install a more recent Mono Debugger version.");
+		}
+	}
+}
Index: Mono.Debugging.Server.Mdb/Makefile
===================================================================
--- Mono.Debugging.Server.Mdb/Makefile	(revision 136420)
+++ Mono.Debugging.Server.Mdb/Makefile	(revision 136421)
@@ -59,6 +59,8 @@
 	ICollectionAdaptor.cs \
 	IndexerValueReference.cs \
 	LiteralValueReference.cs \
+	MdbAdaptor.cs \
+	MdbAdaptorFactory.cs \
 	NamespaceValueReference.cs \
 	NRefactoryEvaluator.cs \
 	NullValueReference.cs \
@@ -77,7 +79,9 @@
 
 DATA_FILES = 
 
-RESOURCES = 
+RESOURCES =  \
+	MdbAdaptor-2-0.cs \
+	MdbAdaptor-2-4-2.cs 
 
 EXTRAS = \
 	ChangeLog 
Index: Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs
===================================================================
--- Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs	(revision 0)
+++ Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs	(revision 136421)
@@ -0,0 +1,51 @@
+// 
+// MdbAdaptor22.cs
+//  
+// Author:
+//       Lluis Sanchez Gual <lluis@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Mono.Debugger;
+
+namespace DebuggerServer
+{
+	public class MdbAdaptor_2_4_2: MdbAdaptor
+	{
+		public override void SetupXsp (DebuggerConfiguration config)
+		{
+			config.SetupXSP ();
+			config.StopOnManagedSignals = true;
+		}
+		
+		public override void InitializeConfiguration (Mono.Debugger.DebuggerConfiguration config)
+		{
+			base.InitializeConfiguration (config);
+			config.RedirectOutput = true;
+		}
+
+		public override void AbortThread (Mono.Debugger.Thread thread, Mono.Debugger.RuntimeInvokeResult result)
+		{
+			result.Abort ();
+		}
+	}
+}
Index: Mono.Debugging.Server.Mdb/ChangeLog
===================================================================
--- Mono.Debugging.Server.Mdb/ChangeLog	(revision 136420)
+++ Mono.Debugging.Server.Mdb/ChangeLog	(revision 136421)
@@ -1,3 +1,16 @@
+2009-06-18  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* Makefile:
+	* MdbAdaptor.cs:
+	* MdbAdaptor-2-0.cs:
+	* DebuggerServer.cs:
+	* MdbAdaptor-2-4-2.cs:
+	* MdbAdaptorFactory.cs:
+	* RuntimeInvokeManager.cs:
+	* Mono.Debugging.Server.Mdb.csproj: Added support for mono
+	  2.4.2. Since the api changed, access to the changed methods
+	  has to be done through a dynamically compiled adapter.
+
 2009-02-20  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* Mono.Debugging.Server.Mdb.csproj: Updated references.
Index: Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs
===================================================================
--- Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs	(revision 136420)
+++ Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs	(revision 136421)
@@ -52,9 +52,7 @@
 					lock (operationsToCancel) {
 						if (!aborted) {
 							aborted = true;
-							res.Abort ();
-							res.CompletedEvent.WaitOne ();
-							ctx.Thread.AbortInvocation ();
+							Server.Instance.MdbAdaptor.AbortThread (ctx.Thread, res);
 							WaitToStop (ctx.Thread);
 						}
 					}
@@ -73,9 +71,7 @@
 						}
 						else
 							aborted = true;
-						res.Abort ();
-						res.CompletedEvent.WaitOne ();
-						ctx.Thread.AbortInvocation ();
+						Server.Instance.MdbAdaptor.AbortThread (ctx.Thread, res);
 						WaitToStop (ctx.Thread);
 						throw new TimeOutException ();
 					}
Index: Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs
===================================================================
--- Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs	(revision 0)
+++ Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs	(revision 136421)
@@ -0,0 +1,128 @@
+// 
+// MdbAdaptorFactory.cs
+//  
+// Author:
+//       Lluis Sanchez Gual <lluis@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Reflection;
+using System.Diagnostics;
+using System.IO;
+
+namespace DebuggerServer
+{
+	public static class MdbAdaptorFactory
+	{
+		// Bump this version number if any change is in MdbAdaptor or subclases
+		const int ApiVersion = 2;
+		
+		static readonly string[] supportedVersions = new string[] {"2-4-2", "2-0"};
+		
+		public static MdbAdaptor CreateAdaptor (string mdbVersion)
+		{
+			ProcessStartInfo pinfo = new ProcessStartInfo ();
+			pinfo.FileName = "gmcs";
+			
+			if (mdbVersion != null) {
+				MdbAdaptor mdb = TryCreateAdaptor (pinfo, mdbVersion);
+				if (mdb == null)
+					throw new InvalidOperationException ("Unsupported MDB version");
+				return mdb;
+			}
+			
+			foreach (string v in supportedVersions) {
+				MdbAdaptor mdb = TryCreateAdaptor (pinfo, v);
+				if (mdb != null)
+					return mdb;
+			}
+			throw new InvalidOperationException ("Unsupported MDB version");
+		}
+		
+		static MdbAdaptor TryCreateAdaptor (ProcessStartInfo pinfo, string versions)
+		{
+			string[] versionsArray = versions.Split ('|');
+			string version = versionsArray [0];
+			
+			string tmpPath = Path.GetTempPath ();
+			tmpPath = Path.Combine (tmpPath, "monodevelop-debugger-mdb");
+			if (!Directory.Exists (tmpPath))
+				Directory.CreateDirectory (tmpPath);
+			
+			string outFile = Path.Combine (tmpPath, "adaptor-" + ApiVersion + "--" + version + ".dll");
+			
+			string[] refAssemblies = new string [] {
+				typeof(MdbAdaptorFactory).Assembly.Location,
+				typeof(Mono.Debugger.Debugger).Assembly.Location,
+				typeof(Mono.Debugging.Client.DebuggerSession).Assembly.Location,
+				typeof(Mono.Debugging.Backend.Mdb.IDebuggerServer).Assembly.Location
+			};
+			
+			DateTime refsTime = DateTime.MinValue;
+			foreach (string rasm in refAssemblies) {
+				DateTime t = File.GetLastWriteTime (rasm);
+				if (t > refsTime)
+					refsTime = t;
+			}
+			
+			if (!File.Exists (outFile) || File.GetLastWriteTime (outFile) < refsTime) {
+				string args = "/t:library ";
+				args += "\"/out:" + outFile + "\" ";
+				foreach (string rasm in refAssemblies)
+					args += "\"/r:" + rasm + "\" ";
+				
+				// Write the source code for all required classes
+				foreach (string ver in versionsArray) {
+					Stream s = typeof(MdbAdaptorFactory).Assembly.GetManifestResourceStream ("MdbAdaptor-" + ver + ".cs");
+					StreamReader sr = new StreamReader (s);
+					string txt = sr.ReadToEnd ();
+					sr.Close ();
+					s.Close ();
+					
+					string csfile = Path.Combine (tmpPath, "adaptor-" + ver + ".cs");
+					File.WriteAllText (csfile, txt);
+					args += "\"" + csfile + "\" ";
+				}
+				
+				pinfo.Arguments = args;
+				Process proc = Process.Start (pinfo);
+				proc.WaitForExit ();
+				if (proc.ExitCode != 0)
+					return null;
+				Console.WriteLine ("Generated: " + outFile);
+			}
+			
+			Assembly asm = Assembly.LoadFrom (outFile);
+			Type at = asm.GetType ("DebuggerServer.MdbAdaptor_" + version.Replace ('-','_'));
+			if (at != null) {
+				try {
+					MdbAdaptor a = (MdbAdaptor) Activator.CreateInstance (at);
+					a.MdbVersion = version;
+					return a;
+				} catch {
+					// MDB version not really supported
+				}
+			}
+			return null;
+		}
+	}
+}
Index: Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs
===================================================================
--- Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs	(revision 0)
+++ Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs	(revision 136421)
@@ -0,0 +1,40 @@
+// 
+// MdbAdaptor_2_0.cs
+//  
+// Author:
+//       Lluis Sanchez Gual <lluis@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace DebuggerServer
+{
+	public class MdbAdaptor_2_0: MdbAdaptor
+	{
+		public override void AbortThread (Mono.Debugger.Thread thread, Mono.Debugger.RuntimeInvokeResult result)
+		{
+			result.Abort ();
+			result.CompletedEvent.WaitOne ();
+			thread.AbortInvocation ();
+		}
+	}
+}
Index: Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs
===================================================================
--- Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs	(revision 136420)
+++ Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs	(revision 136421)
@@ -37,11 +37,13 @@
 	public class MonoDebuggerSession: DebuggerSession
 	{
 		DebuggerController controller;
+		static string detectedMdbVersion;
 		
 		public void StartDebugger ()
 		{
 			controller = new DebuggerController (this, Frontend);
 			controller.StartDebugger ();
+			InitMdbVersion ();
 		}
 		
 		public override void Dispose ()
@@ -54,6 +56,12 @@
 		{
 			controller.DebuggerServer.Run (startInfo);
 		}
+		
+		void InitMdbVersion ()
+		{
+			// Cache detected mdb versions, so version detection is done only once
+			detectedMdbVersion = controller.DebuggerServer.InitializeMdb (detectedMdbVersion);
+		}
 
 		protected override void OnAttachToProcess (int processId)
 		{
Index: Mono.Debugging.Backend.Mdb/ChangeLog
===================================================================
--- Mono.Debugging.Backend.Mdb/ChangeLog	(revision 136420)
+++ Mono.Debugging.Backend.Mdb/ChangeLog	(revision 136421)
@@ -1,3 +1,10 @@
+2009-06-18  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* IDebuggerServer.cs:
+	* MonoDebuggerSession.cs: Added support for mono 2.4.2. Since
+	  the api changed, access to the changed methods has to be
+	  done through a dynamically compiled adapter.
+
 2009-03-05  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* AssemblyInfo.cs:
Index: Mono.Debugging.Backend.Mdb/IDebuggerServer.cs
===================================================================
--- Mono.Debugging.Backend.Mdb/IDebuggerServer.cs	(revision 136420)
+++ Mono.Debugging.Backend.Mdb/IDebuggerServer.cs	(revision 136421)
@@ -32,6 +32,8 @@
 {
 	public interface IDebuggerServer
 	{
+		string InitializeMdb (string mdbVersion);
+		
 		void Run (DebuggerStartInfo startInfo);
 
 		void Stop ();