ILC miss counting/tracing support jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sun, 01 Aug 2010 12:11:07 +0100
branchjv
changeset 17794 da075fbea903
parent 17793 63acd2c16c43
child 17795 569eec7576f1
ILC miss counting/tracing support
NamespaceAwareLookup.st
ObjectMemory.st
stx_libbasic.st
--- a/NamespaceAwareLookup.st	Wed Jul 28 21:58:47 2010 +0100
+++ b/NamespaceAwareLookup.st	Sun Aug 01 12:11:07 2010 +0100
@@ -145,10 +145,14 @@
                         selector: selector
                         arguments: argArrayOrNil)].
         "No method found"
+		seen addAll: namespaces.
         namespaces do:
             [:namespace|
             namespace ifNotNil:
-                [imports addAll: namespace imports]].
+                [namespace imports do:
+                    [:import|
+					(seen includes: import) ifFalse:
+						[imports add: import]]]].
         imports isEmpty ifFalse:[queue add: imports]].
 	].
 	
@@ -213,7 +217,7 @@
 !NamespaceAwareLookup class methodsFor:'documentation'!
 
 version_SVN
-    ^ '$Id: NamespaceAwareLookup.st 10560 2010-07-28 20:58:47Z vranyj1 $'
+    ^ '$Id: NamespaceAwareLookup.st 10562 2010-08-01 11:11:07Z vranyj1 $'
 ! !
 
 NamespaceAwareLookup initialize!
--- a/ObjectMemory.st	Wed Jul 28 21:58:47 2010 +0100
+++ b/ObjectMemory.st	Sun Aug 01 12:11:07 2010 +0100
@@ -1086,17 +1086,25 @@
 ilcMisses: newValue
 	
 	newValue class == SmallInteger ifFalse:[^self error:'Not an integer value'].
-%{
-	RETURN ( __MKSMALLINT ( ilcMisses ( __intVal ( newValue ) ) ) );
-%}
+%{  /* NOCONTEXT */
+	/*extern int __ilcMisses(int);*/
+#ifndef WIN32	
+	RETURN ( __MKSMALLINT ( __ilcMisses ( __intVal ( newValue ) ) ) );
+#endif
+%}.
+	^ -1
 
 !
 
 ilcMissesTrace: bool
 	
 %{
-	RETURN ( ilcMissesTrace ( bool == true ) ? true : false );
-%}
+	/*extern int __ilcMissesTrace(int);*/
+#ifndef WIN32		
+	RETURN ( __ilcMissesTrace ( bool == true ) ? true : false );
+#endif
+%}.
+	^ 0
 
 !
 
@@ -5370,7 +5378,7 @@
 !ObjectMemory class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ObjectMemory.st 10557 2010-07-23 17:11:42Z vranyj1 $'
+    ^ '$Id: ObjectMemory.st 10562 2010-08-01 11:11:07Z vranyj1 $'
 !
 
 version_CVS
@@ -5378,7 +5386,7 @@
 !
 
 version_SVN
-    ^ '$Id: ObjectMemory.st 10557 2010-07-23 17:11:42Z vranyj1 $'
+    ^ '$Id: ObjectMemory.st 10562 2010-08-01 11:11:07Z vranyj1 $'
 ! !
 
 ObjectMemory initialize!
--- a/stx_libbasic.st	Wed Jul 28 21:58:47 2010 +0100
+++ b/stx_libbasic.st	Sun Aug 01 12:11:07 2010 +0100
@@ -534,13 +534,13 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'10558M'"$"
+    ^ "$SVN-Revision:"'10561M'"$"
 ! !
 
 !stx_libbasic class methodsFor:'documentation'!
 
 version
-    ^ '$Id: stx_libbasic.st 10560 2010-07-28 20:58:47Z vranyj1 $'
+    ^ '$Id: stx_libbasic.st 10562 2010-08-01 11:11:07Z vranyj1 $'
 !
 
 version_CVS
@@ -548,5 +548,5 @@
 !
 
 version_SVN
-    ^ '$Id: stx_libbasic.st 10560 2010-07-28 20:58:47Z vranyj1 $'
+    ^ '$Id: stx_libbasic.st 10562 2010-08-01 11:11:07Z vranyj1 $'
 ! !