Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simulating libmanagement.so for tomcat jk_new_structure
authorhlopkmar
Thu, 03 Nov 2011 17:15:44 +0000
branchjk_new_structure
changeset 1079 0bab665c1e54
parent 1078 614cf5325969
child 1080 f842a3bac28a
simulating libmanagement.so for tomcat
src/JavaClassReader.st file | annotate | diff | comparison | revisions
src/JavaVM.st file | annotate | diff | comparison | revisions 
--- a/src/JavaClassReader.st	Thu Nov 03 11:50:57 2011 +0000
+++ b/src/JavaClassReader.st	Thu Nov 03 17:15:44 2011 +0000
@@ -305,7 +305,7 @@
                         nm := p , tryName , '.class'.
                         nm asFilename exists ifTrue: [
                             (Java isExcludedFromClassPath: nm) ifFalse: [
-                                self breakPoint: #mh.
+                             
                                  "means we are successfully going to read something :)"
                                 rslt := self readFile: nm ignoring: classesBeingLoaded.
                                 rslt notNil ifTrue: [ ^ rslt. ].
@@ -342,9 +342,9 @@
 
     "Created: / 15-04-1996 / 14:58:53 / cg"
     "Modified: / 20-10-1998 / 17:24:54 / cg"
-    "Modified: / 21-10-2011 / 13:39:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 23-10-2011 / 12:03:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 23-10-2011 / 21:48:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 03-11-2011 / 18:14:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 readFile: aFilename ignoring: classesBeingLoaded 
--- a/src/JavaVM.st	Thu Nov 03 11:50:57 2011 +0000
+++ b/src/JavaVM.st	Thu Nov 03 17:15:44 2011 +0000
@@ -1688,34 +1688,30 @@
 initializeSimulatedNativeLibs
     "return a collection of native libs which are considered 
      being already loaded (used with jdk >= 1.2)"
-
-    OperatingSystem isUNIXlike ifTrue:[
-        SimulatedNativeLibs := #(
-                                 'libawt.so' 
-                                 'libnet.so' 
-                                 'libcmm.so' 
-                                 'libzip.so'
-                                ).
-        ^self.
-    ].
-    OperatingSystem isMSWINDOWSlike ifTrue:[
-        SimulatedNativeLibs := #(
-                                 'awt.dll' 
-                                 'net.dll' 
-                                 'cmm.dll' 
-                                 'zip.dll'
-                                ).
-        ^self.
+    
+    OperatingSystem isUNIXlike ifTrue: [
+        SimulatedNativeLibs := #( 'libawt.so'
+                 'libnet.so'
+                 'libcmm.so'
+                 'libzip.so'
+                 'libmanagement.so').
+        ^ self.
+    ].
+    OperatingSystem isMSWINDOWSlike ifTrue: [
+        SimulatedNativeLibs := #( 'awt.dll'
+                 'net.dll'
+                 'cmm.dll'
+                 'zip.dll' ).
+        ^ self.
     ].
     SimulatedNativeLibs := #().
-    
-
-    "
-     self initializeSimulatedNativeLibs
-    "
+
+    "
+     self initializeSimulatedNativeLibs"
 
     "Modified: / 27-01-1998 / 18:43:10 / cg"
     "Modified: / 01-04-2011 / 23:02:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 03-11-2011 / 18:15:28 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 initializeSimulatedNativeMemory
@@ -5100,56 +5096,51 @@
 
 !JavaVM class methodsFor:'native - java.lang'!
 
-_java_lang_ClassLoader_NativeLibrary_load: nativeContext
-
+_java_lang_ClassLoader_NativeLibrary_load: nativeContext 
     <javanative: 'java/lang/ClassLoader$NativeLibrary' name: 'load'>
-
-        "/ introduced with jdk1.2 ... (sigh)
-
-    |nativeLoader jLibName libName libHandle index|
-
+    "/ introduced with jdk1.2 ... (sigh)
+    
+    | nativeLoader  jLibName  libName  libHandle  index |
+    self breakPoint:#mh.
     nativeLoader := nativeContext receiver.
-    jLibName := nativeContext argAt:1.
-    libName := (Java as_ST_String:jLibName) asFilename baseName.
-
-    (index := SimulatedNativeLibs indexOf:libName) ~~ 0 ifTrue:[
-"/        ('JAVA: builtIn nativeLibLoad simulated: ' , libName) printNL.
-        nativeLoader instVarNamed:'handle' put:index.
-        ^ self "/ void
-    ].
-    (LoadedNativeLibs notNil 
-    and:[LoadedNativeLibs includesKey:libName]) ifTrue:[
-"/        ('JAVA: native library already loaded: ' , libName) printNL.
-        nativeLoader instVarNamed:'handle' put:(LoadedNativeLibs at:libName).
-        ^ self "/ void
-    ].
-
-    (self confirm:'permission to load native library: ' , libName , ' ?') ifFalse:[
+    jLibName := nativeContext argAt: 1.
+    libName := (Java as_ST_String: jLibName) asFilename baseName.
+    (index := SimulatedNativeLibs indexOf: libName) ~~ 0 ifTrue: [
+        "/        ('JAVA: builtIn nativeLibLoad simulated: ' , libName) printNL.
+        nativeLoader instVarNamed: 'handle' put: index.
+        ^ self
+        "/ void
+    ].
+    (LoadedNativeLibs notNil and: [ LoadedNativeLibs includesKey: libName ]) ifTrue: [
+        "/        ('JAVA: native library already loaded: ' , libName) printNL.
+        nativeLoader instVarNamed: 'handle' put: (LoadedNativeLibs at: libName).
+        ^ self
+        "/ void
+    ].
+    (self confirm: 'permission to load native library: ' , libName , ' ?') ifFalse: [
         ^ self
     ].
-self halt.
-
-    libName asFilename exists ifFalse:[
+    self halt.
+    libName asFilename exists ifFalse: [
         ('JAVA: no file to load nativeLib: ' , libName) printNL.
-        ^ self "/ void
-    ].
-
-    libHandle := ObjectFileLoader loadLibrary:libName.
-    libHandle isNil ifTrue:[
+        ^ self
+        "/ void
+    ].
+    libHandle := ObjectFileLoader loadLibrary: libName.
+    libHandle isNil ifTrue: [
         ('JAVA: failed to load nativeLib: ' , libName) printNL.
-        ^ self "/ void
-    ].
-
-    LoadedNativeLibs isNil ifTrue:[
-        LoadedNativeLibs := Dictionary new.
-    ].
-
-    LoadedNativeLibs at:libName put:libHandle.
-    nativeLoader instVarNamed:'handle' put:(LoadedNativeLibs at:libName).
-    ^ self "/ void
+        ^ self
+        "/ void
+    ].
+    LoadedNativeLibs isNil ifTrue: [ LoadedNativeLibs := Dictionary new. ].
+    LoadedNativeLibs at: libName put: libHandle.
+    nativeLoader instVarNamed: 'handle' put: (LoadedNativeLibs at: libName).
+    ^ self
+    "/ void
 
     "Modified: / 06-02-1998 / 03:12:17 / cg"
     "Created: / 10-12-2010 / 15:11:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 03-11-2011 / 18:12:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 _java_lang_ClassLoader_defineClass1: nativeContext
hg/stx-libjava