PatchSet 5553
Date: 2005/03/13 20:42:37
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Cross-compilation fix for libkaffevm
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/thread.c:
(deadlockDetection) Made static.
(KaffeVM_setDeadlockDetection) New function.
* kaffe/kaffevm/thread.h:
(deadlockDetection) Removed prototype.
(KaffeVM_setDeadlockDetection) Added prototype.
* kaffe/kaffe/main.c (options):
Replace use of deadlockDetection by KaffeVM_setDeadlockDetection.
Members:
ChangeLog:1.3727->1.3728
kaffe/kaffe/main.c:1.79->1.80
kaffe/kaffevm/thread.c:1.93->1.94
kaffe/kaffevm/thread.h:1.25->1.26
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3727 kaffe/ChangeLog:1.3728
--- kaffe/ChangeLog:1.3727 Sun Mar 13 20:18:49 2005
+++ kaffe/ChangeLog Sun Mar 13 20:42:37 2005
@@ -1,6 +1,19 @@
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
- * kaffe/kaffevm/debug.h:
+ * kaffe/kaffevm/thread.c:
+ (deadlockDetection) Made static.
+ (KaffeVM_setDeadlockDetection) New function.
+
+ * kaffe/kaffevm/thread.h:
+ (deadlockDetection) Removed prototype.
+ (KaffeVM_setDeadlockDetection) Added prototype.
+
+ * kaffe/kaffe/main.c (options):
+ Replace use of deadlockDetection by KaffeVM_setDeadlockDetection.
+
+2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/debug.c:
(kaffe_dprintf_fd) Made static.
(dbgSetDprintfFD) New function.
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.79 kaffe/kaffe/kaffe/main.c:1.80
--- kaffe/kaffe/kaffe/main.c:1.79 Sun Mar 13 20:18:51 2005
+++ kaffe/kaffe/kaffe/main.c Sun Mar 13 20:42:41 2005
@@ -812,7 +812,7 @@
}
#endif
else if (strcmp(argv[i], "-nodeadlock") == 0) {
- deadlockDetection = 0;
+ KaffeVM_setDeadlockDetection(0);
}
#if defined(KAFFE_STATS)
else if (strcmp(argv[i], "-vmstats") == 0) {
Index: kaffe/kaffe/kaffevm/thread.c
diff -u kaffe/kaffe/kaffevm/thread.c:1.93 kaffe/kaffe/kaffevm/thread.c:1.94
--- kaffe/kaffe/kaffevm/thread.c:1.93 Fri Mar 11 16:41:53 2005
+++ kaffe/kaffe/kaffevm/thread.c Sun Mar 13 20:42:41 2005
@@ -52,7 +52,18 @@
/* referenced by native/Runtime.c */
jbool runFinalizerOnExit; /* should we run finalizers? */
-jbool deadlockDetection = 1; /* abort if we detect deadlock */
+static jbool deadlockDetection = 1; /* abort if we detect deadlock */
+
+/**
+ * Turn deadlock detection on or off.
+ *
+ * @param detect 0 to turn detection off, !0 to turn it on.
+ */
+void
+KaffeVM_setDeadlockDetection(jbool detect)
+{
+ deadlockDetection = detect;
+}
Hjava_lang_Class* ThreadClass;
Hjava_lang_Class* VMThreadClass;
Index: kaffe/kaffe/kaffevm/thread.h
diff -u kaffe/kaffe/kaffevm/thread.h:1.25 kaffe/kaffe/kaffevm/thread.h:1.26
--- kaffe/kaffe/kaffevm/thread.h:1.25 Thu Dec 16 06:13:52 2004
+++ kaffe/kaffe/kaffevm/thread.h Sun Mar 13 20:42:41 2005
@@ -55,7 +55,7 @@
extern Hjava_lang_Class* ThreadClass;
struct _Collector;
-extern jbool deadlockDetection;
+extern void KaffeVM_setDeadlockDetection(jbool detection);
#define THREAD_NATIVE() ((void*)KTHREAD(current)())
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
