Jp/http module with general fixes to c++ vm, ffi, etc

modules/Examples/HTTPServer/ExampleAPI.st

@@ -3,18 +3,17 @@ Class {
 	#superclass : #Object,
 	#instVars : [
 		'request',
-		'response',
-		'server'
+		'response'
 	],
 	#category : #'Examples-HTTPServer'
 }
 
 { #category : #spec }
 ExampleAPI >> hello [
-	server library 
-		response: response asParameter
-		setContents: 'hello, world!' externalCopy asParameter
-		type: 'text/html' externalCopy asParameter
+	| name |
+	name := request paramAt: 'name'.
+	name isEmpty ifTrue: [name := 'world'].
+	response setContents: 'hello, ', name, '!' type: 'text/html'
 ]
 
 { #category : #spec }
@@ -27,8 +26,3 @@ ExampleAPI >> response: aResponse [
 	response := aResponse
 ]
 
-{ #category : #spec }
-ExampleAPI >> server: aCPPHTTPServer [
-	server := aCPPHTTPServer
-]
-

modules/Examples/HTTPServer/HTTPServerModule.st

@@ -10,22 +10,30 @@ Class {
 { #category : #spec }
 HTTPServerModule >> imports [
 	^{
-		#'HTTP.CPPHTTPServer' -> #(CPPHTTPServer).
+		#'HTTP.CPPHTTPServer' -> #(HTTPServer).
 		#FFI -> #(ExternalLibrary).
-
 	}
 ]
 
+{ #category : #spec }
+HTTPServerModule >> handle: request into: response with: selector [
+	| api |
+	api := ExampleAPI new
+		       request: request;
+			   response: response.
+	api perform: selector.
+	"response headersAt: 'Access-Control-Allow-Origin' put: '*'."
+]
+
 { #category : #services }
 HTTPServerModule >> main: arguments [
-	| server |
-	"Transcript show: 'starting server!'."
+	| server base |
 	ExternalLibrary module initializeForCurrentPlatform.
-
-	server := CPPHTTPServer new apiClass: ExampleAPI.
+	base := arguments at: 3 ifAbsent: ['/egg'].
+	server := HTTPServer new.
 	server
-		baseUri: '/egg';
-		routeGET: '/hello' to: #hello.
+		routeGET: base, '/hello/:name' to: #hello with: self.
+	Kernel log: 'server configured, starting!', String cr.
 	server start.
 	^0
 ]

modules/FFI/ExternalHandle.st

@@ -15,6 +15,11 @@ ExternalHandle class >> new [
 	^self new: WordSize
 ]
 
+{ #category : #'accessing' }
+ExternalHandle >> asInteger [
+	^self pointerAtOffset: 0
+]
+
 { #category : #'testing' }
 ExternalHandle >> isValid [
 	^self asInteger != 0

modules/FFI/ExternalLibrary.st

@@ -29,6 +29,11 @@ ExternalLibrary class >> linuxFilename [
 	^'lib', self libname, '.so'
 ]
 
+{ #category : #accessing }
+ExternalLibrary class >> macFilename [
+	^'lib', self libname, '.dylib'
+]
+
 { #category : #accessing }
 ExternalLibrary class >> windowsFilename [
 	^self libname, '.dll'

modules/FFI/ExternalMemory.st

@@ -189,7 +189,7 @@ ExternalMemory >> externalCopy [
 
 { #category : #finalization }
 ExternalMemory >> finalizationRegistry [
-	^Smalltalk resourceRegistry
+	^Kernel session resourceRegistry
 ]
 
 { #category : #finalization }

modules/FFI/FFIModule.st

@@ -35,7 +35,11 @@ FFIModule >> initializeFor: moduleName loader: loaderName [
 		at: #FFI put: self;
 		at: #OS put: module.
 	loaderType := module namespace at: loaderName.
-	loader := loaderType new.
+	loader := loaderType new
+]
+
+{ #category : #private }
+FFIModule >> initializeLibC [
 	libc := LibC new.
 	loader bootstrapOpen: libc.
 	defaultHeap := mallocHeap := MallocHeap new
@@ -52,18 +56,24 @@ FFIModule >> initializeForCurrentPlatform [
 ]
 
 { #category : #initialization }
-FFIModule >> initializeForMac [
-	self initializeFor: #'FFI.Mac' loader: #MacLibraryLoader
+FFIModule >> initializeForLinux [
+	self
+		initializeFor: #'FFI.Posix' loader: #PosixLibraryLoader;
+		initializeLibC
 ]
 
 { #category : #initialization }
-FFIModule >> initializeForLinux [
-	self initializeFor: #'FFI.Linux' loader: #LinuxLibraryLoader
+FFIModule >> initializeForMac [
+	self initializeFor: #'FFI.Posix' loader: #PosixLibraryLoader.
+	loader beMac.
+	self initializeLibC.
 ]
 
 { #category : #initialization }
 FFIModule >> initializeForWindows [
-	self initializeFor: #'FFI.Windows' loader: #WindowsLibraryLoader
+	self
+		initializeFor: #'FFI.Windows' loader: #WindowsLibraryLoader;
+		initializeLibC.
 ]
 
 { #category : #initialization }

modules/FFI/Posix/PosixLibraryLoader.st

@@ -0,0 +1,80 @@
+"
+    Copyright (c) 2024, Javier Pimás. 
+    See (MIT) license in root directory.
+
+	I'm an object that allows loading dynamic libraries in Linux and Mac. For that,
+	I call dlopen and dlsym, part of dl library. To bootstrap, the dl library
+	object handle and dlsym addresses are initialized through a host VM primitive.
+"
+
+Class {
+	#name : #PosixLibraryLoader,
+	#superclass : #LibraryLoader,
+	#instVars : [
+		'dl',
+		'linux'
+	],
+	#category : #FFI
+}
+
+{ #category : #accessing }
+PosixLibraryLoader >> beMac [
+	linux := false
+]
+
+{ #category : #bootstrap }
+PosixLibraryLoader >> bootstrapOpen: anExternalLibrary [
+	"
+		We do this because externalCopy asParameter requires libc/calloc to be already loaded
+	"
+	| filename path parameter handle |
+	filename := self libraryFilename: anExternalLibrary class.
+	path := anExternalLibrary class libpath, filename.
+	parameter := Array with: path.
+	handle := filename = 'libc.dylib'
+		ifTrue: [dl handle asInteger]
+		ifFalse: [dl dlopen: parameter flags: 1. "RTLD_LAZY"].
+	handle = 0 ifTrue: [dl lastError].
+	anExternalLibrary address: handle.
+]
+
+{ #category : #accessing }
+PosixLibraryLoader >> close: anExternalLibrary [
+	dl dlclose: anExternalLibrary asParameter
+]
+
+{ #category : #accessing }
+PosixLibraryLoader >> findSymbol: aSymbol in: anExternalLibrary [
+	^dl dlsym: anExternalLibrary asParameter symbol: aSymbol externalCopy asParameter
+]
+
+{ #category : #accessing }
+PosixLibraryLoader >> initialize [
+	linux := true.
+	dl := DLLibrary new.
+	Kernel host initializeFFI: dl symbolFinder: DLLibrary >> #dlsym:symbol:.
+	self initializeDLErrorDescriptor
+]
+
+{ #category : #accessing }
+PosixLibraryLoader >> initializeDLErrorDescriptor [
+	"
+		Sending dlerror for the first time initializes libdl descriptor, through dlsym. This makes
+		subsequent sends of dlerror not call dlsym, which would invalidate the last error code
+	"
+	dl dlerror
+]
+{ #category : #accessing }
+PosixLibraryLoader >> libraryFilename: externalLibrary [
+	^linux ifTrue: [ externalLibrary linuxFilename ] ifFalse: [ externalLibrary macFilename ]
+]
+
+{ #category : #services }
+PosixLibraryLoader >> open: anExternalLibrary [
+	| filename path handle |
+	filename := self libraryFilename: anExternalLibrary class.
+	path := anExternalLibrary class libpath, filename.
+	handle := dl dlopen: path externalCopy asParameter flags: 1. "RTLD_LAZY"
+	handle = 0 ifTrue: [Error signal: dl lastError].
+	anExternalLibrary address: handle
+]

modules/FFI/Linux/LinuxModule.st → modules/FFI/Posix/PosixModule.st

@@ -4,17 +4,17 @@
 "
 
 Class {
-	#name : #LinuxModule,
+	#name : #PosixModule,
 	#superclass : #Module,
 	#category : #FFI
 }
 
 { #category : #services }
-LinuxModule >> externalCopyOfString: aString [
+PosixModule >> externalCopyOfString: aString [
 	^Kernel utf8 externalCopyOf: aString
 ]
 
 { #category : #services }
-LinuxModule >> imports [
+PosixModule >> imports [
 	^{ #FFI -> #(ExternalLibrary ExternalMemory LibraryLoader) }
 ]