Vm-dev October 2012

vm-dev@lists.squeakfoundation.org

27 participants
45 discussions

VM Maker: CMakeVMMaker-IgorStasenko.183.mcz
by commits＠source.squeak.org 24 Oct '12

24 Oct '12

Igor Stasenko uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-IgorStasenko.183.mcz ==================== Summary ==================== Name: CMakeVMMaker-IgorStasenko.183 Author: IgorStasenko Time: 24 October 2012, 4:50:57.936 pm UUID: 7ad869fa-f225-4b1c-b20f-113223b6dd82 Ancestors: CMakeVMMaker-IgorStasenko.182 - fix libpng dependency =============== Diff against CMakeVMMaker-IgorStasenko.182 =============== Item was changed: ----- Method: CMLibPng>>defineAsTarget (in category 'generating actions') ----- defineAsTarget gen puts: 'add_custom_target(${libName} + DEPENDS "${externalModulesDir}/${libraryFileName}" - DEPENDS zlib "${externalModulesDir}/${libraryFileName}" )'! Item was added: + ----- Method: CMWin32LibPng>>defineAsTarget (in category 'as yet unclassified') ----- + defineAsTarget + + gen puts: + 'add_custom_target(${libName} + DEPENDS zlib "${externalModulesDir}/${libraryFileName}" + )'!

1 0

Re: [Pharo-project] BlockClosure>>ensure: implementation
by Eliot Miranda 24 Oct '12

24 Oct '12

On Mon, Oct 22, 2012 at 2:17 AM, Clément Bera <clement.bera(a)inria.fr> wrote: > Hello, > > I don't understand something on BlockClosure>>ensure:. Why does it use > 'self valueNoContextSwitch' and not 'self value' ? In which case is there > an issue ? Prior to my closure implementation BlockContext>>value[:value:*] was not a context switch point. So to preserve the threading semantics of ensure: we implemented ensure: in terms of BlockClosure>>valueNoContextSwitch, which is not a context-switch point, as opposed to BlockClosure>>value[:value:*]. The context switch points in the VM are non-primitive sends (or failing primitives, i.e. full method activation), backward branches, the Process primitives suspend, resume, signal and wait (and CrtiticalSection/Mutex enter and exit) and block evaluation. > > Thank you for any answers > > BlockClosure>>ensure: is implemented this way : > > ensure: aBlock > "Evaluate a termination block after evaluating the receiver, regardless of > whether the receiver's evaluation completes. N.B. This method is *not* > implemented as a primitive. Primitive 198 always fails. The VM uses prim > 198 in a context's method as the mark for an ensure:/ifCurtailed: > activation." > > | complete returnValue | > <primitive: 198> > returnValue := *self valueNoContextSwitch*. > complete ifNil:[ > complete := true. > aBlock value. > ]. > ^ returnValue > > -- best, Eliot

3 2

VM Maker: CMakeVMMaker-EstebanLorenzano.183.mcz
by commits＠source.squeak.org 23 Oct '12

23 Oct '12

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.183.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.183 Author: EstebanLorenzano Time: 23 October 2012, 6:44:06.075 pm UUID: 441cb284-f69f-4186-ab8e-15645689e2b9 Ancestors: CMakeVMMaker-EstebanLorenzano.182, CMakeVMMaker-IgorStasenko.182 - merged with Igors =============== Diff against CMakeVMMaker-EstebanLorenzano.182 =============== Item was changed: ----- Method: CMCairo>>archiveMD5Sum (in category 'package properties') ----- archiveMD5Sum + ^ '645b7c1421ed52260d0853e3215c1d8f'! - ^ '87649eb75789739d517c743e94879e51'! Item was changed: ----- Method: CMCairo>>build (in category 'generating actions') ----- build - gen puts: ' add_custom_command(OUTPUT "${libcairoInstalled}" COMMAND ./configure --prefix=''${installPrefix}'' PKG_CONFIG="${pkgconfigPath}" PKG_CONFIG_PATH="${installPrefix}/lib/pkgconfig" CFLAGS=''-arch i386'' LDFLAGS=''-arch i386'' --disable-silent-rules --disable-xlib --disable-dependency-tracking COMMAND make COMMAND make install WORKING_DIRECTORY "${libSourcesDir}" DEPENDS "${unpackTarget}" pkg-config freetype2 libpng pixman COMMENT "Building ${libName}" ) ' ! Item was changed: ----- Method: CMCairo>>copyArtefacts (in category 'generating actions') ----- copyArtefacts + self + copy: '${libcairoInstalled}' + to: '${externalModulesDir}/${libraryFileName}' + ! - gen puts: - 'add_custom_command( - OUTPUT "${externalModulesDir}/${libraryFileName}" - COMMAND cp ${libcairoInstalled} ${externalModulesDir}/${libraryFileName} - DEPENDS "${libcairoInstalled}" - )'! Item was changed: ----- Method: CMCairo>>defineAsTarget (in category 'generating actions') ----- defineAsTarget gen puts: 'add_custom_target(${libName} + DEPENDS pixman freetype2 "${externalModulesDir}/${libraryFileName}" - DEPENDS "${externalModulesDir}/${libraryFileName}" )'! Item was changed: ----- Method: CMCairo>>downloadURL (in category 'package properties') ----- downloadURL + ^ 'http://www.cairographics.org/releases/cairo-1.12.6.tar.xz'! - ^ 'http://www.cairographics.org/releases/cairo-1.12.2.tar.xz'! Item was changed: ----- Method: CMCairo>>unpackedDirName (in category 'package properties') ----- unpackedDirName + ^ 'cairo-1.12.6'! - ^ 'cairo-1.12.2'! Item was changed: ----- Method: CMCairoBundle class>>supports: (in category 'as yet unclassified') ----- supports: aConfig "right now, Mac only" + ^ aConfig platformName = 'iOS' ! - ^ aConfig platformName = 'iOS'! Item was added: + ----- Method: CMCairoBundle>>macOSXBuildFlags (in category 'as yet unclassified') ----- + macOSXBuildFlags + ^ 'CFLAGS=''-m32 -march=pentium4'' LDFLAGS=''-m32 -march=pentium4"'! Item was added: + ----- Method: CMCairoBundle>>win32BuildFlags (in category 'as yet unclassified') ----- + win32BuildFlags + ^ 'CFLAGS=''-m32 -march=pentium4'' LDFLAGS=''-m32 -march=pentium4"'! Item was changed: ----- Method: CMFreetype2>>copyArtefacts (in category 'generating actions') ----- copyArtefacts + self + copy: '${ft2libInstalled}' + to: '${externalModulesDir}/${libraryFileName}'.! - gen puts: - 'add_custom_command( - OUTPUT "${externalModulesDir}/${libraryFileName}" - COMMAND cp "${ft2libInstalled}" "${externalModulesDir}/${libraryFileName}" - DEPENDS "${ft2libInstalled}" - )'! Item was added: + ----- Method: CMIOSFreetype2 class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + "just for iPhone" + ^ aConfig class = StackIPhoneConfig! Item was changed: ----- Method: CMLibPng>>defineAsTarget (in category 'generating actions') ----- defineAsTarget gen puts: 'add_custom_target(${libName} + DEPENDS zlib "${externalModulesDir}/${libraryFileName}" - DEPENDS "${externalModulesDir}/${libraryFileName}" )'! Item was removed: - ----- Method: CMOSXFreetype2 class>>supports: (in category 'as yet unclassified') ----- - supports: aConfig - ^self = aConfig freetypeLibClass! Item was added: + CMThirdpartyLibrary subclass: #CMOpenSSL + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMOpenSSL class>>canonicalName (in category 'as yet unclassified') ----- + canonicalName + ^ 'openssl'! Item was changed: ----- Method: CMPixman>>defineAsTarget (in category 'generating actions') ----- defineAsTarget gen puts: 'add_custom_target(${libName} + DEPENDS libpng "${externalModulesDir}/${libraryFileName}" - DEPENDS "${externalModulesDir}/${libraryFileName}" )'! Item was changed: ----- Method: CMPkgConfig>>defineAsTarget (in category 'generating actions') ----- defineAsTarget gen puts: ' add_custom_target(${libName} DEPENDS "${pkgConfigBinary}" ) ' ! Item was added: + ----- Method: CMThirdpartyLibrary>>copy:to: (in category 'generating actions') ----- + copy: src to: dest + + | str | + + + str := 'add_custom_command( OUTPUT "{2}" + COMMAND cp "{1}" "{2}" + DEPENDS "{1}" + )' format: {src. dest }. + + gen puts: str! Item was changed: ----- Method: CMThirdpartyLibrary>>generateFor: (in category 'generating cmake file') ----- generateFor: aVMGenerator + | libDir stream contents | - | libDir stream | vmGen := aVMGenerator. gen := CMakeGenerator new output: (String new writeStream). libDir := (aVMGenerator thirdpartyDir / self canonicalName) assureExistence. + stream := String new writeStream. + - stream := libDir forceNewFileNamed: gen outputFileName. - stream ifNil: [ self error: 'Cannot write ', gen outputFileName , 'to: ', libDir fullName ]. - self generate. + stream nextPutAll: (vmGen config fixLineEndsOf: gen output contents). - stream nextPutAll: (vmGen config fixLineEndsOf: gen output contents); close. + contents := stream contents. + + (self isFile: (libDir fullNameFor: gen outputFileName) hasContents: contents) ifFalse: [ + "contents changed, update the file. Because fucking cmake will force rebuild everything if we change its modification date + without changing its contents" + (libDir forceNewFileNamed: gen outputFileName) nextPutAll: contents; close. + ]. + + vmGen addSubdirectory: vmGen thirdpartyDirName , '/' , self canonicalName. self defineGlobalTargets. ! Item was added: + ----- Method: CMThirdpartyLibrary>>isFile:hasContents: (in category 'generating cmake file') ----- + isFile: aFileName hasContents: aString + + | newContents old | + + newContents := false. + + old := FileStream oldFileOrNoneNamed: aFileName. + + old ifNil: [ ^ false ]. + + ^ [ old contents = aString ] ensure: [ old close ]! Item was added: + CMCairo subclass: #CMWin32Cairo + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32Cairo class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32Cairo>>build (in category 'as yet unclassified') ----- + build + " Note: echo #define _SSIZE_T_DEFINED 1 >> config.h + there just for a workaround of bug in cairo, + which fails the build it when building some unrelared utils. It does not affects library build, but i don't know how to tell it to not bother + building everything but just library + " + + + gen + puts: + ' + add_custom_command(OUTPUT "${libcairoInstalled}" + COMMAND ./configure --prefix=''${installPrefix}'' PKG_CONFIG="${pkgconfigPath}" + PKG_CONFIG_PATH="${installPrefix}/lib/pkgconfig" CFLAGS="-m32 -march=pentium4 -I${installPrefix}/include" LDFLAGS="-m32 -march=pentium4 -L${installPrefix}/lib" + --disable-silent-rules --disable-xlib --disable-dependency-tracking + + COMMAND echo "#define _SSIZE_T_DEFINED 1" >> config.h + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" pkg-config freetype2 libpng pixman + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32Cairo>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + + ^ 'libcairo-2.dll'! Item was added: + ----- Method: CMWin32Cairo>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + gen + set: #libraryFileName to: self libraryFileName; + set: #libcairoInstalled toString: '${installPrefix}/bin/${libraryFileName}'. + ! Item was added: + CMLibPng subclass: #CMWin32LibPng + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32LibPng class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32LibPng>>build (in category 'as yet unclassified') ----- + build + + "LIBS=-L${installPrefix}/lib" + gen + puts: + ' + add_custom_command(OUTPUT "${libpngInstalled}" + COMMAND ./configure --prefix=''${installPrefix}'' CFLAGS="-m32 -march=pentium4 -I${installPrefix}/include" CPPFLAGS="-m32 -I${installPrefix}/include" LDFLAGS="-m32 -march=pentium4 -L${installPrefix}/lib" + COMMAND make + COMMAND make install + COMMAND cp "${installPrefix}/lib/libpng.dll.a" "${installPrefix}/lib/libpng12.dll.a" + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" pkg-config + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32LibPng>>dependencies (in category 'as yet unclassified') ----- + dependencies + ^ #( 'pkg-config' 'zlib')! Item was added: + ----- Method: CMWin32LibPng>>downloadURL (in category 'as yet unclassified') ----- + downloadURL + ^ 'ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng12/libpng-1.2.…' + ! Item was added: + ----- Method: CMWin32LibPng>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + + ^ 'libpng-3.dll'! Item was added: + ----- Method: CMWin32LibPng>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + + "add include path" + gen + set: #libraryFileName to: self libraryFileName; + set: #libpngInstalled toString: '${installPrefix}/bin/${libraryFileName}'. + ! Item was added: + CMOpenSSL subclass: #CMWin32OpenSSL + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32OpenSSL class>>platformName (in category 'as yet unclassified') ----- + platformName + ^'win32'! Item was added: + ----- Method: CMWin32OpenSSL>>archiveMD5Sum (in category 'as yet unclassified') ----- + archiveMD5Sum + "answer the MD5 checksum (in string) for downloaded library archive + (to check that downloaded file is not corrupt). + + You can take this sum by issuing: + md5 filename + from command line + " + ^ 'ae412727c8c15b67880aef7bd2999b2e'! Item was added: + ----- Method: CMWin32OpenSSL>>build (in category 'as yet unclassified') ----- + build + + gen + puts: + ' + add_custom_command(OUTPUT "${libSourcesDir}/Makefile" + COMMAND ./config shared --prefix=''${installPrefix}'' + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" + ) + + add_custom_command(OUTPUT "${libInstalled}" + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${libSourcesDir}/Makefile" + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32OpenSSL>>configurationFlags (in category 'as yet unclassified') ----- + configurationFlags + ^ 'shared'! Item was added: + ----- Method: CMWin32OpenSSL>>copyArtefacts (in category 'as yet unclassified') ----- + copyArtefacts + + self copy: '${installPrefix}/bin/libeay32.dll' to: '${externalModulesDir}/libeay32.dll'. + self copy: '${installPrefix}/bin/ssleay32.dll' to: '${externalModulesDir}/ssleay32.dll'. + " self copy: '${installPrefix}/lib/libssl.dll.a' to: '${externalModulesDir}/libssl.dll.a'. + self copy: '${installPrefix}/lib/libcrypto.dll.a' to: '${externalModulesDir}/libcrypto.dll.a'. + " + " + 'libcrypto.dll.a' 'libssl.dll.a'. + "! Item was added: + ----- Method: CMWin32OpenSSL>>defineAsTarget (in category 'as yet unclassified') ----- + defineAsTarget + + gen puts: + 'add_custom_target(', self buildTarget , ' + DEPENDS + "${externalModulesDir}/libeay32.dll" + "${externalModulesDir}/ssleay32.dll" + )' + + "${externalModulesDir}/${libraryFileName}" + ! Item was added: + ----- Method: CMWin32OpenSSL>>defineGlobalTargets (in category 'as yet unclassified') ----- + defineGlobalTargets + + ! Item was added: + ----- Method: CMWin32OpenSSL>>downloadURL (in category 'as yet unclassified') ----- + downloadURL + ^'http://www.openssl.org/source/openssl-1.0.1c.tar.gz'! Item was added: + ----- Method: CMWin32OpenSSL>>includeDir (in category 'as yet unclassified') ----- + includeDir + + ^ '"${thirdpartyDir}/out/include"'! Item was added: + ----- Method: CMWin32OpenSSL>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + ^ 'libssl.dll.a'! Item was added: + ----- Method: CMWin32OpenSSL>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + + gen + set: #libraryFileName to: self libraryFileName; + set: #libInstalled to: '${installPrefix}/lib/${libraryFileName}'! Item was added: + ----- Method: CMWin32OpenSSL>>unpackedDirName (in category 'as yet unclassified') ----- + unpackedDirName + ^ 'openssl-1.0.1c'! Item was added: + CMPixman subclass: #CMWin32Pixman + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32Pixman class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32Pixman>>build (in category 'as yet unclassified') ----- + build + + gen + puts: + ' + add_custom_command(OUTPUT "${libpixmanInstalled}" + COMMAND ./configure --prefix=''${installPrefix}'' PKG_CONFIG="${pkgconfigPath}" + PKG_CONFIG_PATH="${installPrefix}/lib/pkgconfig" CFLAGS="-m32 -march=pentium4 -I${installPrefix}/include" LDFLAGS="-m32 -march=pentium4" LIBS="-L${installPrefix}/lib" + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" pkg-config + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32Pixman>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + ^ 'libpixman-1-0.dll'! Item was added: + ----- Method: CMWin32Pixman>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + + "add include path" + gen + set: #libraryFileName to: self libraryFileName; + set: #libpixmanInstalled toString: '${installPrefix}/bin/${libraryFileName}'. + ! Item was added: + CMPkgConfig subclass: #CMWin32PkgConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! + + !CMWin32PkgConfig commentStamp: '<historical>' prior: 0! + - use 0.27.1 version from official source, which builds on windows + + http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz + + - ./configure --with-internal-glib -! Item was added: + ----- Method: CMWin32PkgConfig class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32PkgConfig>>archiveMD5Sum (in category 'as yet unclassified') ----- + archiveMD5Sum + ^ '5392b4e3372879c5bf856173b418d6a2'! Item was added: + ----- Method: CMWin32PkgConfig>>build (in category 'as yet unclassified') ----- + build + gen + puts: ' + add_custom_command(OUTPUT "${pkgConfigBinary}" + COMMAND ./configure --prefix="${installPrefix}" --with-internal-glib CFLAGS="-m32 -march=pentium4" LDFLAGS="-m32 -march=pentium4" + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32PkgConfig>>defineGlobalTargets (in category 'as yet unclassified') ----- + defineGlobalTargets + + "none" + vmGen + set: #installPrefix toString: '${thirdpartyDir}/out'; + set: #pkgconfigPath toString: '${installPrefix}/bin/pkg-config.exe' + ! Item was added: + ----- Method: CMWin32PkgConfig>>downloadURL (in category 'as yet unclassified') ----- + downloadURL + ^ 'http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz'! Item was added: + ----- Method: CMWin32PkgConfig>>setVariables (in category 'as yet unclassified') ----- + setVariables + + super setVariables. + + gen set: #pkgConfigBinary toString: '${installPrefix}/bin/pkg-config.exe'! Item was added: + ----- Method: CMWin32PkgConfig>>unpackedDirName (in category 'as yet unclassified') ----- + unpackedDirName + + ^ 'pkg-config-0.27.1'! Item was added: + CMThirdpartyLibrary subclass: #CMWin32ZLib + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32ZLib class>>canonicalName (in category 'as yet unclassified') ----- + canonicalName + ^ 'zlib'! Item was added: + ----- Method: CMWin32ZLib class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32ZLib>>archiveMD5Sum (in category 'as yet unclassified') ----- + archiveMD5Sum + "answer the MD5 checksum (in string) for downloaded library archive + (to check that downloaded file is not corrupt). + + You can take this sum by issuing: + md5 filename + from command line + " + ^ '60df6a37c56e7c1366cca812414f7b85'! Item was added: + ----- Method: CMWin32ZLib>>build (in category 'as yet unclassified') ----- + build + + ' COMMAND ./configure --prefix="${installPrefix}" --archs="-arch i386" '. + + gen + puts: ' + add_custom_command(OUTPUT "${libzInstalled}" + COMMAND make -fwin32/Makefile.gcc + COMMAND make install -fwin32/Makefile.gcc prefix="${installPrefix}" INCLUDE_PATH="${installPrefix}/include" LIBRARY_PATH="${installPrefix}/lib" BINARY_PATH="${installPrefix}/bin" SHARED_MODE=1 + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32ZLib>>copyArtefacts (in category 'as yet unclassified') ----- + copyArtefacts + + self + copy: '${libzInstalled}' + to: '${externalModulesDir}/${libraryFileName}' + ! Item was added: + ----- Method: CMWin32ZLib>>defineAsTarget (in category 'as yet unclassified') ----- + defineAsTarget + + gen puts: + 'add_custom_target(', self buildTarget , ' + DEPENDS + "${externalModulesDir}/${libraryFileName}" + )' + + "${externalModulesDir}/${libraryFileName}" + ! Item was added: + ----- Method: CMWin32ZLib>>defineGlobalTargets (in category 'as yet unclassified') ----- + defineGlobalTargets + ! Item was added: + ----- Method: CMWin32ZLib>>downloadURL (in category 'as yet unclassified') ----- + downloadURL + ^ 'http://zlib.net/zlib-1.2.7.tar.gz'! Item was added: + ----- Method: CMWin32ZLib>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + ^ 'zlib1.dll'! Item was added: + ----- Method: CMWin32ZLib>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + gen + set: #libraryFileName to: self libraryFileName; + set: #libzInstalled toString: '${installPrefix}/bin/${libraryFileName}'. + ! Item was added: + ----- Method: CMWin32ZLib>>unpackedDirName (in category 'as yet unclassified') ----- + unpackedDirName + ^ 'zlib-1.2.7'! Item was changed: ----- Method: CMakePluginGenerator>>generate (in category 'code generation') ----- generate | name | output := String new writeStream. name := plugin moduleName. #( vmGen config setGlobalOptions: self. self printHeader; project: name; "include directories generated for build" include: '../directories.cmake'. self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'. ). self message: (internal ifTrue: [ 'Adding internal plugin: '] ifFalse: ['Adding external plugin: ']) , name. self set: #pluginName toString: name; set: #pluginSrc toString: '${srcPluginsDir}/', name; set: #pluginCross toString: '${crossDir}/plugins/', name; set: #pluginPlatform toString: '${targetPlatform}/plugins/', name. "clear LINKLIBS variable" self set: #LINKLIBS to: ''. internal ifTrue: [ self puts: 'add_definitions(-DSQUEAK_BUILTIN_PLUGIN)']. self addSources: { name , '.c' } prefixed: '${pluginSrc}/'. " default include directories for plugin " self includeDirectories: '${pluginSrc} ${pluginCross} ${targetPlatform}/plugins/${pluginName}'. "Not needed because there are already there (inherited from main configuration)" "self addDefinitions: vmGen config compilerFlags." " perform config's configureXYZ: message to apply per-plugin custom rules, if any " vmGen config configurePlugin: plugin with: self. extraRules ifNotNil: [ extraRules value: self ]. " generate a static lib for internal plugin, or shared for external" internal ifTrue: [ self cmd: 'add_library' params: name , ' STATIC ${sources}'. ] ifFalse: [ self cmd: 'add_library' params: name , ' SHARED ${sources}'. " self cmd: 'set_property' params: 'TARGET ' , name , ' PROPERTY LINK_FLAGS -bundle'" ]. vmGen config extraPluginSettings: self. self isExternal ifTrue: [ self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'. ]. " see senders of #linkFlags " self cmd: 'set_property' params: 'TARGET ', name, ' PROPERTY LINK_FLAGS "${linkFlags}"'. "set dependencies" + self puts: 'IF (',self moduleName , '_dependencies)'. - self puts: 'IF (${',self moduleName , '_dependencies})'. self cmd: 'add_dependencies' params: name , ' ${', self moduleName , '_dependencies}'. + self puts: 'ENDIF (',self moduleName , '_dependencies)'. - self puts: 'ENDIF (${',self moduleName , '_dependencies})'. self saveFile.! Item was changed: ----- Method: CogFamilyWindowsConfig>>configureSqueakSSLPlugin: (in category 'plugin extra rules') ----- configureSqueakSSLPlugin: maker + | lib | - maker addPlatformSources: #('sqUnixOpenSSL.c'). + lib := self addThirdpartyLibrary: 'openssl'. - maker addPlatformSources: #('libcrypto.dll.a' 'libssl.dll.a'). + maker includeDirectories: lib includeDir. - maker includeDirectories: '"C:/MinGW/msys/1.0/home/sig/openssl/openssl-1.0.1c/include/"'. maker linkDirectories: '${outputDir}'. maker addExternalLibraries: #( + 'libeay32.dll' - 'libeay32.dll' 'ssleay32.dll' + ). + + maker addDependency: lib buildTarget + ! - )! Item was changed: ----- Method: CogWindowsConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags "depends on config ..." ^ self commonCompilerFlags, ' ' , self compilerFlagsRelease! Item was added: + CogWindowsConfig subclass: #CogWindowsDebugConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Windows'! Item was added: + ----- Method: CogWindowsDebugConfig>>compilerFlags (in category 'as yet unclassified') ----- + compilerFlags + "depends on config ..." + ^ self commonCompilerFlags, ' ' , self compilerFlagsDebug! Item was added: + ----- Method: CogWindowsDebugConfig>>setExtraTargetProperties: (in category 'as yet unclassified') ----- + setExtraTargetProperties: maker + + maker addExternalLibraries: self externalLibraries. + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: '${outputDir}'. + + !

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.182.mcz
by commits＠source.squeak.org 23 Oct '12

23 Oct '12

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.182.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.182 Author: EstebanLorenzano Time: 23 October 2012, 6:42:53.927 pm UUID: 7eb37e28-9f77-4c1b-9264-ef66ac71a9c8 Ancestors: CMakeVMMaker-IgorStasenko.181 - added StackSimulatorConfig, runs iStackVM in simulator (thanks Nick!) - Added Info.plist properties for managing memory and other options -- added options for Web Mode too =============== Diff against CMakeVMMaker-IgorStasenko.181 =============== Item was added: + ----- Method: StackIPhoneConfig>>ImageIsScrollable (in category 'bundle strings') ----- + ImageIsScrollable + ^false! Item was added: + ----- Method: StackIPhoneConfig>>ImageIsWritable (in category 'bundle strings') ----- + ImageIsWritable + ^true! Item was added: + ----- Method: StackIPhoneConfig>>VMMemorySize (in category 'bundle strings') ----- + VMMemorySize + ^1024 * 1024 * 64 "64M"! Item was added: + ----- Method: StackIPhoneConfig>>WebViewAsUI (in category 'bundle strings') ----- + WebViewAsUI + ^false! Item was added: + ----- Method: StackIPhoneConfig>>WebViewUrl (in category 'bundle strings') ----- + WebViewUrl + ^'http://localhost:8080'! Item was changed: ----- Method: StackIPhoneConfig>>architecture (in category 'accessing') ----- architecture + ^'armv7'! - ^'armv6'! Item was changed: ----- Method: StackIPhoneConfig>>commonCompilerFlags (in category 'settings') ----- commonCompilerFlags "Common compiler flags" ^{ "'-miphoneos-version-min=4.3'. " + '-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer/SDKs/{target}{sdkVersion}.sdk' nameFormat: { 'target'-> self targetDevice. 'sdkVersion'->self sdkVersion} asDictionary. - '-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', self sdkVersion, '.sdk'. '-x objective-c'. '-std=gnu99'. '-falign-functions=16'. '-fno-gcse'. '-fno-cse-follow-jumps'. '-fvisibility=hidden'. '-funroll-loops'. '-finline-functions'. '-mno-thumb'. '-fwrapv'. '-DSTACKVM=1'. '-DCOGMTVM=0'. '-DUSE_GLOBAL_STRUCT=0'. '-DBASE_HEADER_SIZE=4'. '-DTARGET_OS_IS_IPHONE'. '-DHAVE_UUID_GENERATE'. "'-DUSE_INLINE_MEMORY_ACCESSORS'. " '-DHAVE_SYS_TIME_H'. '-DLSB_FIRST'. '-DHAVE_NANOSLEEP'. '-DISQUEAK_IMAGE=', self imageName. + '-DISQUEAK_SOURCES=PharoV10'. + '-DSTACKVM'}! - '-DISQUEAK_SOURCES=PharoV10'}! Item was changed: ----- Method: StackIPhoneConfig>>compilerFlagsRelease (in category 'settings') ----- compilerFlagsRelease + ^#('-g0' '-O3' '-fomit-frame-pointer' '-DNDEBUG' '-DDEBUGVM=0')! - ^#('-g0' '-O3' '-fomit-frame-pointer' '-DNDEBUG' '-DDEBUGVM=0' '-DSTACKVM')! Item was changed: ----- Method: StackIPhoneConfig>>configureFT2Plugin: (in category 'plugin extra rules') ----- configureFT2Plugin: maker "extra rules for Freetype plugin. a custom rule to build freetype library" | lib devRoot sdkRoot | "maker isExternal ifFalse: [ self error: 'building internal FT2Plugin is not supported yet' ]." + devRoot := '/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer' + nameFormat: { 'target'->self targetDevice} asDictionary. - devRoot := '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer'. sdkRoot := '{devRoot}/SDKs/iPhoneOS{sdkVersion}.sdk' nameFormat: {'devRoot'->devRoot. 'sdkVersion'->self sdkVersion} asDictionary. "add freetype library into loop" lib := self addThirdpartyLibrary: 'freetype2'. lib configurationFlags: ({ '--without-zlib'. '--without-bzip2'. '--host=arm-apple-darwin'. '--enable-static=yes'. '--enable-shared=no'. 'CC={devRoot}/usr/bin/gcc'. 'CXX={devRoot}/usr/bin/g++'. + 'CFLAGS=\\"-arch {architecture} -std=c99 -Wno-trigraphs -O2 -fwrapv -Wreturn-type -Wunused-variable -fmessage-length=0 -miphoneos-version-min=4.0 -I{sdkRoot}/usr/include/libxml2 -isysroot {sdkRoot}\\"'. + 'LDFLAGS=\\"-arch {architecture} -isysroot {sdkRoot}\\"'} + collect: [ :each | each nameFormat: { + 'architecture'->self architecture. + 'sdkRoot'->sdkRoot. + 'devRoot'->devRoot} asDictionary ]). - 'CFLAGS=\\"-arch armv6 -std=c99 -Wno-trigraphs -O2 -fwrapv -Wreturn-type -Wunused-variable -fmessage-length=0 -miphoneos-version-min=4.0 -I{sdkRoot}/usr/include/libxml2 -isysroot {sdkRoot}\\"'. - 'LDFLAGS=\\"-arch armv6 -isysroot {sdkRoot}\\"'} - collect: [ :each | each nameFormat: {'sdkRoot'->sdkRoot. 'devRoot'->devRoot} asDictionary ]). "maker set: 'XCODE_ATTRIBUTE_CONFIGURATION_BUILD_DIR' toString: ''." "link plugin with freetype lib" maker addExternalLibrary: '${thirdpartyDir}/out/lib/', lib libraryFileName. maker includeDirectories: lib includeDir. ! Item was changed: ----- Method: StackIPhoneConfig>>plistKeys (in category 'bundle strings') ----- plistKeys ^super plistKeys, #(CFBundleIconFile57 CFBundleIconFile72 CFBundleIconFile1024 UIDeviceFamily + UIFileSharingEnabled + VMMemorySize + ImageIsWritable + ImageIsScrollable + WebViewAsUI + WebViewUrl) - UIFileSharingEnabled) ! Item was changed: ----- Method: StackIPhoneConfig>>plistTemplate (in category 'bundle strings') ----- plistTemplate self flag: #todo. "CFBundleDisplayName is using @CFBundleExecutable@ that's probably wrong" ^'<?xml version="1.0" encoding="UTF-8"?> <!!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> <string>en</string> <key>CFBundleDisplayName</key> <string>@CFBundleExecutable@</string> <key>CFBundleExecutable</key> <string>@CFBundleExecutable@</string> <key>CFBundleIconFile</key> <string>@CFBundleIconFile@</string> <key>CFBundleIconFiles</key> <array> <string>@CFBundleIconFile@</string> <string>@CFBundleIconFile57@</string> <string>@CFBundleIconFile72@</string> <string>@CFBundleIconFile1024@</string> </array> <key>CFBundleIdentifier</key> <string>@CFBundleIdentifier@</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> <string>@CFBundleName@</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleResourceSpecification</key> <string>ResourceRules.plist</string> <key>CFBundleSignature</key> <string>FRAC</string> <key>CFBundleSupportedPlatforms</key> <array> <string>iPhoneOS</string> </array> <key>CFBundleVersion</key> <string>1.1.7</string> <key>LSRequiresIPhoneOS</key> <true/> <key>MinimumOSVersion</key> <string>3.1.3</string> <key>NSMainNibFile</key> <string>MainWindow</string> <key>UIDeviceFamily</key> <array> @UIDeviceFamily@ </array> <key>UIPrerenderedIcon</key> <false/> <key>UIStatusBarHidden</key> <true/> <key>UIFileSharingEnabled</key> + <@UIFileSharingEnabled@/> + <key>ImageIsWritable</key> + <@ImageIsWritable@/> + <key>ImageIsScrollable</key> + <@ImageIsScrollable@/> + <key>VMMemorySize</key> + <integer>@VMMemorySize@</integer> + <key>WebViewAsUI</key> + <@WebViewAsUI@/> + <key>WebViewUrl</key> + <string>@WebViewUrl@</string> - <@UIFileSharingEnabled@/> </dict> </plist> '! Item was changed: ----- Method: StackIPhoneConfig>>sdkVersion (in category 'accessing') ----- sdkVersion + ^'6.0'! - ^'5.1'! Item was changed: ----- Method: StackIPhoneConfig>>setCommonProperties: (in category 'settings') ----- setCommonProperties: maker maker set: 'CMAKE_CROSSCOMPILING' to: 'TRUE'. maker set: 'CMAKE_SYSTEM_NAME' to: 'Darwin'. maker set: 'CMAKE_SYSTEM_PROCESSOR' to: 'arm'. maker set: 'SDKVER' toString: self sdkVersion. + maker set: 'DEVROOT' toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer' + nameFormat: {'target'->self targetDevice} asDictionary). + maker set: 'SDKROOT' toString: '${DEVROOT}/SDKs/', self targetDevice,'${SDKVER}.sdk'. - maker set: 'DEVROOT' toString: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer'. - maker set: 'SDKROOT' toString: '${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk'. maker set: 'CMAKE_OSX_SYSROOT' to: 'iphoneos${SDKVER}'. maker set: 'CMAKE_FIND_ROOT_PATH' to: '"${SDKROOT}" "${DEVROOT}"'. maker set: 'CMAKE_FIND_ROOT_PATH_MODE_PROGRAM' to: 'ONLY'. maker set: 'CMAKE_FIND_ROOT_PATH_MODE_LIBRARY' to: 'ONLY'. maker set: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE' to: 'ONLY'. maker set: 'CMAKE_EXE_LINKER_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. maker set: 'CMAKE_C_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. maker set: 'CMAKE_CXX_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. maker addFrameworks: self frameworks.! Item was changed: ----- Method: StackIPhoneConfig>>setGlobalOptions: (in category 'settings') ----- setGlobalOptions: maker "set any CMake global options, before declaring a project in cmake file" maker set: 'CMAKE_C_COMPILER' + to: ('/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer/usr/bin/gcc' + nameFormat: {'target' -> self targetDevice} asDictionary). - to: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc'. maker set: 'CMAKE_CXX_COMPILER' + to: ('/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer/usr/bin/g++' + nameFormat: {'target' -> self targetDevice } asDictionary). + self architecture ifNotNil: [ + maker set: 'CMAKE_OSX_ARCHITECTURES' to: self architecture ]. - to: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++'. - maker set: 'CMAKE_OSX_ARCHITECTURES' to: 'arm6'. maker set: 'CMAKE_OSX_SYSROOT' to: '/'. ! Item was added: + ----- Method: StackIPhoneConfig>>targetDevice (in category 'accessing') ----- + targetDevice + ^'iPhoneOS'! Item was added: + StackIPhoneConfig subclass: #StackSimulatorConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-IOS'! Item was added: + ----- Method: StackSimulatorConfig>>architecture (in category 'accessing') ----- + architecture + ^'i386'! Item was added: + ----- Method: StackSimulatorConfig>>executableName (in category 'accessing') ----- + executableName + ^'iStackVMSimulator'! Item was added: + ----- Method: StackSimulatorConfig>>standardIncludes (in category 'source files') ----- + standardIncludes + ^super standardIncludes, {'/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer/SDKs/{target}{sdkVersion}.sdk/usr/include/' + nameFormat: {'target'->self targetDevice. 'sdkVersion'->self sdkVersion} asDictionary} + ! Item was added: + ----- Method: StackSimulatorConfig>>targetDevice (in category 'accessing') ----- + targetDevice + ^'iPhoneSimulator'!

1 0

VM Maker: CMakeVMMaker-IgorStasenko.182.mcz
by commits＠source.squeak.org 23 Oct '12

23 Oct '12

Igor Stasenko uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-IgorStasenko.182.mcz ==================== Summary ==================== Name: CMakeVMMaker-IgorStasenko.182 Author: IgorStasenko Time: 23 October 2012, 4:48:31.121 pm UUID: 7aa001cd-4c19-e540-a99f-fdc8f6a0b449 Ancestors: CMakeVMMaker-IgorStasenko.181 - fix mac builds - cairo now builds on Windows =============== Diff against CMakeVMMaker-IgorStasenko.181 =============== Item was changed: ----- Method: CMCairo>>archiveMD5Sum (in category 'package properties') ----- archiveMD5Sum + ^ '645b7c1421ed52260d0853e3215c1d8f'! - ^ '87649eb75789739d517c743e94879e51'! Item was changed: ----- Method: CMCairo>>build (in category 'generating actions') ----- build - gen puts: ' add_custom_command(OUTPUT "${libcairoInstalled}" COMMAND ./configure --prefix=''${installPrefix}'' PKG_CONFIG="${pkgconfigPath}" PKG_CONFIG_PATH="${installPrefix}/lib/pkgconfig" CFLAGS=''-arch i386'' LDFLAGS=''-arch i386'' --disable-silent-rules --disable-xlib --disable-dependency-tracking COMMAND make COMMAND make install WORKING_DIRECTORY "${libSourcesDir}" DEPENDS "${unpackTarget}" pkg-config freetype2 libpng pixman COMMENT "Building ${libName}" ) ' ! Item was changed: ----- Method: CMCairo>>copyArtefacts (in category 'generating actions') ----- copyArtefacts + self + copy: '${libcairoInstalled}' + to: '${externalModulesDir}/${libraryFileName}' + ! - gen puts: - 'add_custom_command( - OUTPUT "${externalModulesDir}/${libraryFileName}" - COMMAND cp ${libcairoInstalled} ${externalModulesDir}/${libraryFileName} - DEPENDS "${libcairoInstalled}" - )'! Item was changed: ----- Method: CMCairo>>defineAsTarget (in category 'generating actions') ----- defineAsTarget gen puts: 'add_custom_target(${libName} + DEPENDS pixman freetype2 "${externalModulesDir}/${libraryFileName}" - DEPENDS "${externalModulesDir}/${libraryFileName}" )'! Item was changed: ----- Method: CMCairo>>downloadURL (in category 'package properties') ----- downloadURL + ^ 'http://www.cairographics.org/releases/cairo-1.12.6.tar.xz'! - ^ 'http://www.cairographics.org/releases/cairo-1.12.2.tar.xz'! Item was changed: ----- Method: CMCairo>>unpackedDirName (in category 'package properties') ----- unpackedDirName + ^ 'cairo-1.12.6'! - ^ 'cairo-1.12.2'! Item was changed: ----- Method: CMCairoBundle class>>supports: (in category 'as yet unclassified') ----- supports: aConfig "right now, Mac only" + ^ aConfig platformName = 'iOS' ! - ^ aConfig platformName = 'iOS'! Item was added: + ----- Method: CMCairoBundle>>macOSXBuildFlags (in category 'as yet unclassified') ----- + macOSXBuildFlags + ^ 'CFLAGS=''-m32 -march=pentium4'' LDFLAGS=''-m32 -march=pentium4"'! Item was added: + ----- Method: CMCairoBundle>>win32BuildFlags (in category 'as yet unclassified') ----- + win32BuildFlags + ^ 'CFLAGS=''-m32 -march=pentium4'' LDFLAGS=''-m32 -march=pentium4"'! Item was changed: ----- Method: CMFreetype2>>copyArtefacts (in category 'generating actions') ----- copyArtefacts + self + copy: '${ft2libInstalled}' + to: '${externalModulesDir}/${libraryFileName}'.! - gen puts: - 'add_custom_command( - OUTPUT "${externalModulesDir}/${libraryFileName}" - COMMAND cp "${ft2libInstalled}" "${externalModulesDir}/${libraryFileName}" - DEPENDS "${ft2libInstalled}" - )'! Item was added: + ----- Method: CMIOSFreetype2 class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + "just for iPhone" + ^ aConfig class = StackIPhoneConfig! Item was changed: ----- Method: CMLibPng>>defineAsTarget (in category 'generating actions') ----- defineAsTarget gen puts: 'add_custom_target(${libName} + DEPENDS zlib "${externalModulesDir}/${libraryFileName}" - DEPENDS "${externalModulesDir}/${libraryFileName}" )'! Item was removed: - ----- Method: CMOSXFreetype2 class>>supports: (in category 'as yet unclassified') ----- - supports: aConfig - ^self = aConfig freetypeLibClass! Item was added: + CMThirdpartyLibrary subclass: #CMOpenSSL + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMOpenSSL class>>canonicalName (in category 'as yet unclassified') ----- + canonicalName + ^ 'openssl'! Item was changed: ----- Method: CMPixman>>defineAsTarget (in category 'generating actions') ----- defineAsTarget gen puts: 'add_custom_target(${libName} + DEPENDS libpng "${externalModulesDir}/${libraryFileName}" - DEPENDS "${externalModulesDir}/${libraryFileName}" )'! Item was changed: ----- Method: CMPkgConfig>>defineAsTarget (in category 'generating actions') ----- defineAsTarget gen puts: ' add_custom_target(${libName} DEPENDS "${pkgConfigBinary}" ) ' ! Item was added: + ----- Method: CMThirdpartyLibrary>>copy:to: (in category 'generating actions') ----- + copy: src to: dest + + | str | + + + str := 'add_custom_command( OUTPUT "{2}" + COMMAND cp "{1}" "{2}" + DEPENDS "{1}" + )' format: {src. dest }. + + gen puts: str! Item was changed: ----- Method: CMThirdpartyLibrary>>generateFor: (in category 'generating cmake file') ----- generateFor: aVMGenerator + | libDir stream contents | - | libDir stream | vmGen := aVMGenerator. gen := CMakeGenerator new output: (String new writeStream). libDir := (aVMGenerator thirdpartyDir / self canonicalName) assureExistence. + stream := String new writeStream. + - stream := libDir forceNewFileNamed: gen outputFileName. - stream ifNil: [ self error: 'Cannot write ', gen outputFileName , 'to: ', libDir fullName ]. - self generate. + stream nextPutAll: (vmGen config fixLineEndsOf: gen output contents). - stream nextPutAll: (vmGen config fixLineEndsOf: gen output contents); close. + contents := stream contents. + + (self isFile: (libDir fullNameFor: gen outputFileName) hasContents: contents) ifFalse: [ + "contents changed, update the file. Because fucking cmake will force rebuild everything if we change its modification date + without changing its contents" + (libDir forceNewFileNamed: gen outputFileName) nextPutAll: contents; close. + ]. + + vmGen addSubdirectory: vmGen thirdpartyDirName , '/' , self canonicalName. self defineGlobalTargets. ! Item was added: + ----- Method: CMThirdpartyLibrary>>isFile:hasContents: (in category 'generating cmake file') ----- + isFile: aFileName hasContents: aString + + | newContents old | + + newContents := false. + + old := FileStream oldFileOrNoneNamed: aFileName. + + old ifNil: [ ^ false ]. + + ^ [ old contents = aString ] ensure: [ old close ]! Item was added: + CMCairo subclass: #CMWin32Cairo + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32Cairo class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32Cairo>>build (in category 'as yet unclassified') ----- + build + " Note: echo #define _SSIZE_T_DEFINED 1 >> config.h + there just for a workaround of bug in cairo, + which fails the build it when building some unrelared utils. It does not affects library build, but i don't know how to tell it to not bother + building everything but just library + " + + + gen + puts: + ' + add_custom_command(OUTPUT "${libcairoInstalled}" + COMMAND ./configure --prefix=''${installPrefix}'' PKG_CONFIG="${pkgconfigPath}" + PKG_CONFIG_PATH="${installPrefix}/lib/pkgconfig" CFLAGS="-m32 -march=pentium4 -I${installPrefix}/include" LDFLAGS="-m32 -march=pentium4 -L${installPrefix}/lib" + --disable-silent-rules --disable-xlib --disable-dependency-tracking + + COMMAND echo "#define _SSIZE_T_DEFINED 1" >> config.h + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" pkg-config freetype2 libpng pixman + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32Cairo>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + + ^ 'libcairo-2.dll'! Item was added: + ----- Method: CMWin32Cairo>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + gen + set: #libraryFileName to: self libraryFileName; + set: #libcairoInstalled toString: '${installPrefix}/bin/${libraryFileName}'. + ! Item was added: + CMLibPng subclass: #CMWin32LibPng + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32LibPng class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32LibPng>>build (in category 'as yet unclassified') ----- + build + + "LIBS=-L${installPrefix}/lib" + gen + puts: + ' + add_custom_command(OUTPUT "${libpngInstalled}" + COMMAND ./configure --prefix=''${installPrefix}'' CFLAGS="-m32 -march=pentium4 -I${installPrefix}/include" CPPFLAGS="-m32 -I${installPrefix}/include" LDFLAGS="-m32 -march=pentium4 -L${installPrefix}/lib" + COMMAND make + COMMAND make install + COMMAND cp "${installPrefix}/lib/libpng.dll.a" "${installPrefix}/lib/libpng12.dll.a" + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" pkg-config + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32LibPng>>dependencies (in category 'as yet unclassified') ----- + dependencies + ^ #( 'pkg-config' 'zlib')! Item was added: + ----- Method: CMWin32LibPng>>downloadURL (in category 'as yet unclassified') ----- + downloadURL + ^ 'ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng12/libpng-1.2.…' + ! Item was added: + ----- Method: CMWin32LibPng>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + + ^ 'libpng-3.dll'! Item was added: + ----- Method: CMWin32LibPng>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + + "add include path" + gen + set: #libraryFileName to: self libraryFileName; + set: #libpngInstalled toString: '${installPrefix}/bin/${libraryFileName}'. + ! Item was added: + CMOpenSSL subclass: #CMWin32OpenSSL + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32OpenSSL class>>platformName (in category 'as yet unclassified') ----- + platformName + ^'win32'! Item was added: + ----- Method: CMWin32OpenSSL>>archiveMD5Sum (in category 'as yet unclassified') ----- + archiveMD5Sum + "answer the MD5 checksum (in string) for downloaded library archive + (to check that downloaded file is not corrupt). + + You can take this sum by issuing: + md5 filename + from command line + " + ^ 'ae412727c8c15b67880aef7bd2999b2e'! Item was added: + ----- Method: CMWin32OpenSSL>>build (in category 'as yet unclassified') ----- + build + + gen + puts: + ' + add_custom_command(OUTPUT "${libSourcesDir}/Makefile" + COMMAND ./config shared --prefix=''${installPrefix}'' + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" + ) + + add_custom_command(OUTPUT "${libInstalled}" + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${libSourcesDir}/Makefile" + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32OpenSSL>>configurationFlags (in category 'as yet unclassified') ----- + configurationFlags + ^ 'shared'! Item was added: + ----- Method: CMWin32OpenSSL>>copyArtefacts (in category 'as yet unclassified') ----- + copyArtefacts + + self copy: '${installPrefix}/bin/libeay32.dll' to: '${externalModulesDir}/libeay32.dll'. + self copy: '${installPrefix}/bin/ssleay32.dll' to: '${externalModulesDir}/ssleay32.dll'. + " self copy: '${installPrefix}/lib/libssl.dll.a' to: '${externalModulesDir}/libssl.dll.a'. + self copy: '${installPrefix}/lib/libcrypto.dll.a' to: '${externalModulesDir}/libcrypto.dll.a'. + " + " + 'libcrypto.dll.a' 'libssl.dll.a'. + "! Item was added: + ----- Method: CMWin32OpenSSL>>defineAsTarget (in category 'as yet unclassified') ----- + defineAsTarget + + gen puts: + 'add_custom_target(', self buildTarget , ' + DEPENDS + "${externalModulesDir}/libeay32.dll" + "${externalModulesDir}/ssleay32.dll" + )' + + "${externalModulesDir}/${libraryFileName}" + ! Item was added: + ----- Method: CMWin32OpenSSL>>defineGlobalTargets (in category 'as yet unclassified') ----- + defineGlobalTargets + + ! Item was added: + ----- Method: CMWin32OpenSSL>>downloadURL (in category 'as yet unclassified') ----- + downloadURL + ^'http://www.openssl.org/source/openssl-1.0.1c.tar.gz'! Item was added: + ----- Method: CMWin32OpenSSL>>includeDir (in category 'as yet unclassified') ----- + includeDir + + ^ '"${thirdpartyDir}/out/include"'! Item was added: + ----- Method: CMWin32OpenSSL>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + ^ 'libssl.dll.a'! Item was added: + ----- Method: CMWin32OpenSSL>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + + gen + set: #libraryFileName to: self libraryFileName; + set: #libInstalled to: '${installPrefix}/lib/${libraryFileName}'! Item was added: + ----- Method: CMWin32OpenSSL>>unpackedDirName (in category 'as yet unclassified') ----- + unpackedDirName + ^ 'openssl-1.0.1c'! Item was added: + CMPixman subclass: #CMWin32Pixman + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32Pixman class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32Pixman>>build (in category 'as yet unclassified') ----- + build + + gen + puts: + ' + add_custom_command(OUTPUT "${libpixmanInstalled}" + COMMAND ./configure --prefix=''${installPrefix}'' PKG_CONFIG="${pkgconfigPath}" + PKG_CONFIG_PATH="${installPrefix}/lib/pkgconfig" CFLAGS="-m32 -march=pentium4 -I${installPrefix}/include" LDFLAGS="-m32 -march=pentium4" LIBS="-L${installPrefix}/lib" + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" pkg-config + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32Pixman>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + ^ 'libpixman-1-0.dll'! Item was added: + ----- Method: CMWin32Pixman>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + + "add include path" + gen + set: #libraryFileName to: self libraryFileName; + set: #libpixmanInstalled toString: '${installPrefix}/bin/${libraryFileName}'. + ! Item was added: + CMPkgConfig subclass: #CMWin32PkgConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! + + !CMWin32PkgConfig commentStamp: '<historical>' prior: 0! + - use 0.27.1 version from official source, which builds on windows + + http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz + + - ./configure --with-internal-glib -! Item was added: + ----- Method: CMWin32PkgConfig class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32PkgConfig>>archiveMD5Sum (in category 'as yet unclassified') ----- + archiveMD5Sum + ^ '5392b4e3372879c5bf856173b418d6a2'! Item was added: + ----- Method: CMWin32PkgConfig>>build (in category 'as yet unclassified') ----- + build + gen + puts: ' + add_custom_command(OUTPUT "${pkgConfigBinary}" + COMMAND ./configure --prefix="${installPrefix}" --with-internal-glib CFLAGS="-m32 -march=pentium4" LDFLAGS="-m32 -march=pentium4" + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32PkgConfig>>defineGlobalTargets (in category 'as yet unclassified') ----- + defineGlobalTargets + + "none" + vmGen + set: #installPrefix toString: '${thirdpartyDir}/out'; + set: #pkgconfigPath toString: '${installPrefix}/bin/pkg-config.exe' + ! Item was added: + ----- Method: CMWin32PkgConfig>>downloadURL (in category 'as yet unclassified') ----- + downloadURL + ^ 'http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz'! Item was added: + ----- Method: CMWin32PkgConfig>>setVariables (in category 'as yet unclassified') ----- + setVariables + + super setVariables. + + gen set: #pkgConfigBinary toString: '${installPrefix}/bin/pkg-config.exe'! Item was added: + ----- Method: CMWin32PkgConfig>>unpackedDirName (in category 'as yet unclassified') ----- + unpackedDirName + + ^ 'pkg-config-0.27.1'! Item was added: + CMThirdpartyLibrary subclass: #CMWin32ZLib + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Libs'! Item was added: + ----- Method: CMWin32ZLib class>>canonicalName (in category 'as yet unclassified') ----- + canonicalName + ^ 'zlib'! Item was added: + ----- Method: CMWin32ZLib class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + ^ aConfig platformName = 'win32' ! Item was added: + ----- Method: CMWin32ZLib>>archiveMD5Sum (in category 'as yet unclassified') ----- + archiveMD5Sum + "answer the MD5 checksum (in string) for downloaded library archive + (to check that downloaded file is not corrupt). + + You can take this sum by issuing: + md5 filename + from command line + " + ^ '60df6a37c56e7c1366cca812414f7b85'! Item was added: + ----- Method: CMWin32ZLib>>build (in category 'as yet unclassified') ----- + build + + ' COMMAND ./configure --prefix="${installPrefix}" --archs="-arch i386" '. + + gen + puts: ' + add_custom_command(OUTPUT "${libzInstalled}" + COMMAND make -fwin32/Makefile.gcc + COMMAND make install -fwin32/Makefile.gcc prefix="${installPrefix}" INCLUDE_PATH="${installPrefix}/include" LIBRARY_PATH="${installPrefix}/lib" BINARY_PATH="${installPrefix}/bin" SHARED_MODE=1 + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: CMWin32ZLib>>copyArtefacts (in category 'as yet unclassified') ----- + copyArtefacts + + self + copy: '${libzInstalled}' + to: '${externalModulesDir}/${libraryFileName}' + ! Item was added: + ----- Method: CMWin32ZLib>>defineAsTarget (in category 'as yet unclassified') ----- + defineAsTarget + + gen puts: + 'add_custom_target(', self buildTarget , ' + DEPENDS + "${externalModulesDir}/${libraryFileName}" + )' + + "${externalModulesDir}/${libraryFileName}" + ! Item was added: + ----- Method: CMWin32ZLib>>defineGlobalTargets (in category 'as yet unclassified') ----- + defineGlobalTargets + ! Item was added: + ----- Method: CMWin32ZLib>>downloadURL (in category 'as yet unclassified') ----- + downloadURL + ^ 'http://zlib.net/zlib-1.2.7.tar.gz'! Item was added: + ----- Method: CMWin32ZLib>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + ^ 'zlib1.dll'! Item was added: + ----- Method: CMWin32ZLib>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + gen + set: #libraryFileName to: self libraryFileName; + set: #libzInstalled toString: '${installPrefix}/bin/${libraryFileName}'. + ! Item was added: + ----- Method: CMWin32ZLib>>unpackedDirName (in category 'as yet unclassified') ----- + unpackedDirName + ^ 'zlib-1.2.7'! Item was changed: ----- Method: CMakePluginGenerator>>generate (in category 'code generation') ----- generate | name | output := String new writeStream. name := plugin moduleName. #( vmGen config setGlobalOptions: self. self printHeader; project: name; "include directories generated for build" include: '../directories.cmake'. self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'. ). self message: (internal ifTrue: [ 'Adding internal plugin: '] ifFalse: ['Adding external plugin: ']) , name. self set: #pluginName toString: name; set: #pluginSrc toString: '${srcPluginsDir}/', name; set: #pluginCross toString: '${crossDir}/plugins/', name; set: #pluginPlatform toString: '${targetPlatform}/plugins/', name. "clear LINKLIBS variable" self set: #LINKLIBS to: ''. internal ifTrue: [ self puts: 'add_definitions(-DSQUEAK_BUILTIN_PLUGIN)']. self addSources: { name , '.c' } prefixed: '${pluginSrc}/'. " default include directories for plugin " self includeDirectories: '${pluginSrc} ${pluginCross} ${targetPlatform}/plugins/${pluginName}'. "Not needed because there are already there (inherited from main configuration)" "self addDefinitions: vmGen config compilerFlags." " perform config's configureXYZ: message to apply per-plugin custom rules, if any " vmGen config configurePlugin: plugin with: self. extraRules ifNotNil: [ extraRules value: self ]. " generate a static lib for internal plugin, or shared for external" internal ifTrue: [ self cmd: 'add_library' params: name , ' STATIC ${sources}'. ] ifFalse: [ self cmd: 'add_library' params: name , ' SHARED ${sources}'. " self cmd: 'set_property' params: 'TARGET ' , name , ' PROPERTY LINK_FLAGS -bundle'" ]. vmGen config extraPluginSettings: self. self isExternal ifTrue: [ self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'. ]. " see senders of #linkFlags " self cmd: 'set_property' params: 'TARGET ', name, ' PROPERTY LINK_FLAGS "${linkFlags}"'. "set dependencies" + self puts: 'IF (',self moduleName , '_dependencies)'. - self puts: 'IF (${',self moduleName , '_dependencies})'. self cmd: 'add_dependencies' params: name , ' ${', self moduleName , '_dependencies}'. + self puts: 'ENDIF (',self moduleName , '_dependencies)'. - self puts: 'ENDIF (${',self moduleName , '_dependencies})'. self saveFile.! Item was changed: ----- Method: CogFamilyWindowsConfig>>configureSqueakSSLPlugin: (in category 'plugin extra rules') ----- configureSqueakSSLPlugin: maker + | lib | - maker addPlatformSources: #('sqUnixOpenSSL.c'). + lib := self addThirdpartyLibrary: 'openssl'. - maker addPlatformSources: #('libcrypto.dll.a' 'libssl.dll.a'). + maker includeDirectories: lib includeDir. - maker includeDirectories: '"C:/MinGW/msys/1.0/home/sig/openssl/openssl-1.0.1c/include/"'. maker linkDirectories: '${outputDir}'. maker addExternalLibraries: #( + 'libeay32.dll' - 'libeay32.dll' 'ssleay32.dll' + ). + + maker addDependency: lib buildTarget + ! - )! Item was changed: ----- Method: CogWindowsConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags "depends on config ..." ^ self commonCompilerFlags, ' ' , self compilerFlagsRelease! Item was added: + CogWindowsConfig subclass: #CogWindowsDebugConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Windows'! Item was added: + ----- Method: CogWindowsDebugConfig>>compilerFlags (in category 'as yet unclassified') ----- + compilerFlags + "depends on config ..." + ^ self commonCompilerFlags, ' ' , self compilerFlagsDebug! Item was added: + ----- Method: CogWindowsDebugConfig>>setExtraTargetProperties: (in category 'as yet unclassified') ----- + setExtraTargetProperties: maker + + maker addExternalLibraries: self externalLibraries. + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: '${outputDir}'. + + !

1 0

Re: Only ever grows? (was: Re: [squeak-dev] how/where is memory returned to the OS?)
by David T. Lewis 22 Oct '12

22 Oct '12

On Sun, Oct 21, 2012 at 09:35:15PM -0500, Chris Muller wrote: > > Unfortunately there is no easy fix , which will fit all possible use scenarios. > > As you can see from comments in code, this feature was disabled on purpose > > for cases when your application works extensively with external > > resources/libraries, > > which using malloc() a lot. > > You mean FFI? Someone took the trouble to write this for the manpage. > My gut thinks FFI has been around longer than the releasing of memory > feature -- not sure. > > -mmap size[mk] > requests that a variable heap of at most size bytes be allo??? > cated. (The suffixes are as described for the '-memory' > option.) squeak will initially allocate a heap that is large > enough to hold the image, with a small amount of headroom. If > at any time Squeak requires more memory for its image then addi??? > tional space will be allocated dynamically. Likewise, when mem??? > ory is no longer needed it will deallocated and returned to the > system. The size argument places an upper limit on how big the > heap can grow in this fashion. squeak uses a dynamic heap by > default with the maximum size set to 75% of the available vir??? > tual memory or 1 gigabyte, whichever is smaller. > > Eliot, is the useMmap variable you referred to set by this argument? > I tried launching my image with -mmap 700M but it still didn't seem to > want to deallocate. > > Same with the Classic VM. Eliot is referring to Ian Piumarta's explanation in sqUnixMemory.c here: /* Note: * * The code allows memory to be overallocated; i.e., the initial * block is reserved via mmap() and then the unused portion * munmap()ped from the top end. This is INHERENTLY DANGEROUS since * malloc() may randomly map new memory in the block we "reserved" * and subsequently unmap()ped. Enabling this causes crashes in * Croquet, which makes heavy use of the FFI and thus calls malloc() * all over the place. * * For this reason, overallocateMemory is DISABLED by default. * * The upshot of all this is that Squeak will claim (and hold on to) * ALL of the available virtual memory (or at least 75% of it) when * it starts up. If you can't live with that, use the -memory * option to allocate a fixed size heap. */ See also the man page for sbrk for some related cautions about mixing malloc with lower level allocation/deallocation calls. Igor just posted a patch to let you override the default for the command line, but you should be very sure that your application is not doing malloc calls. Plugins (e.g. OSProcess) and FFI calls are entirely free to do this, and you should assume that they will do so unless you positively know that they do not. Chris, may I ask why you see this as a problem? Is there some practical situation in which you are running out of real system memory as a consequence of the memory mapping strategy? <OT> I'll note for the record that Java VMs seem to adopt a much simpler strategy for object memory management: Whenever you run low on memory, they crash. Yet somehow people manage to build commercial systems on top of this. Go figure. </OT> Dave

3 2

Simulators need some care
by Stefan Marr 22 Oct '12

22 Oct '12

Hi: I was trying to use the StackInterpreterSimulator as well the InterpreterSimulator inside the image that is in the Cog svn branch. (with VMMaker.oscog-lw.207) I ran into issues with undefined globals/class vars. I attached a changeset with some of the trivial things I already fixed. However, I ran also into the issue that in StackInterpreter>>#moveFramesIn:through:toPage: FoxCallerContext is not defined, and I have no idea how to replace it. I also had to ignore failing assertions to get that far, and there are plenty of those. The InterpreterSimulator fails because AtCacheTotalSize is not defined. Do you have advice in which context the related changes were made and what the correct fixes would be? I also wonder with all these changes to StackInterpreter to fix the undefined globals, whether the thing is actually still functional. Thanks Stefan -- Stefan Marr Software Languages Lab Vrije Universiteit Brussel Pleinlaan 2 / B-1050 Brussels / Belgium http://soft.vub.ac.be/~smarr Phone: +32 2 629 2974 Fax: +32 2 629 3525

4 3

Fwd: Only ever grows? (was: Re: [squeak-dev] how/where is memory returned to the OS?)
by Igor Stasenko 22 Oct '12

22 Oct '12

This topic belongs to this list. ---------- Forwarded message ---------- From: Igor Stasenko <siguctua(a)gmail.com> Date: 22 October 2012 05:36 Subject: Re: Only ever grows? (was: Re: [squeak-dev] how/where is memory returned to the OS?) To: ma.chris.m(a)gmail.com, The general-purpose Squeak developers list <squeak-dev(a)lists.squeakfoundation.org> On 22 October 2012 04:35, Chris Muller <asqueaker(a)gmail.com> wrote: >> Unfortunately there is no easy fix , which will fit all possible use scenarios. >> As you can see from comments in code, this feature was disabled on purpose >> for cases when your application works extensively with external >> resources/libraries, >> which using malloc() a lot. > > You mean FFI? Someone took the trouble to write this for the manpage. > My gut thinks FFI has been around longer than the releasing of memory > feature -- not sure. > > -mmap size[mk] > requests that a variable heap of at most size bytes be allo‐ > cated. (The suffixes are as described for the '-memory' > option.) squeak will initially allocate a heap that is large > enough to hold the image, with a small amount of headroom. If > at any time Squeak requires more memory for its image then addi‐ > tional space will be allocated dynamically. Likewise, when mem‐ > ory is no longer needed it will deallocated and returned to the > system. The size argument places an upper limit on how big the > heap can grow in this fashion. squeak uses a dynamic heap by > default with the maximum size set to 75% of the available vir‐ > tual memory or 1 gigabyte, whichever is smaller. > > Eliot, is the useMmap variable you referred to set by this argument? > I tried launching my image with -mmap 700M but it still didn't seem to > want to deallocate. > > Same with the Classic VM. > It is controlled by overallocateMemory flag, which is not exposed via command-line options. Here the patched file. I added a new option -releaseUnusedMemory to turn this flag on. I didn't tried to build VM with it, so don't blame me if it doesn't works :) diff --git a/platforms/unix/vm/sqUnixMain.c b/platforms/unix/vm/sqUnixMain.c index a593b2a..875bf0d 100644 --- a/platforms/unix/vm/sqUnixMain.c +++ b/platforms/unix/vm/sqUnixMain.c @@ -98,6 +98,7 @@ static char **squeakArgVec= 0; static int extraMemory= 0; int useMmap= DefaultMmapSize * 1024 * 1024; +extern int overallocateMemory; /* defined in vm/sqUnixMemory.c */ static int useItimer= 1; /* 0 to disable itimer-based clock */ static int installHandlers= 1; /* 0 to disable sigusr1 & sigsegv handlers */ @@ -1263,6 +1264,7 @@ static int vm_parseArgument(int argc, char **argv) /* vm arguments */ if (!strcmp(argv[0], "-help")) { usage(); return 1; } + else if (!strcmp(argv[0], "-releaseUnusedMemory") { overallocateMemory = 1; return 1; } else if (!strcmp(argv[0], "-noevents")) { noEvents = 1; return 1; } else if (!strcmp(argv[0], "-nomixer")) { noSoundMixer = 1; return 1; } else if (!strcmp(argv[0], "-notimer")) { useItimer = 0; return 1; } -- Best regards, Igor Stasenko. -- Best regards, Igor Stasenko.

1 0

Re: [squeak-dev] how/where is memory returned to the OS?
by Eliot Miranda 19 Oct '12

19 Oct '12

On Fri, Oct 19, 2012 at 11:31 AM, Chris Muller <ma.chris.m(a)gmail.com> wrote: > >> I have an image which needed to allocate 500MB of memory for a large > >> operation. Now that operation is done and all objects have been > >> reclaimed. According to VM I am now only using 200MB. > >> > >> (Smalltalk vmParameterAt: 2) max: (Smalltalk vmParameter at: 1) > >> "221923374" > >> > >> However, when I look at my VM process in "top" or the System Monitor, > >> it still says its >500MB. > >> > >> How does this work? > > > > Depends on the platform. On Mac OS X memory is not returned. On Windows > > memory is allocated and freed via VirtualAlloc and VirtualFree. On Unix > > memory is allocated and returned via mmap and munmap by default. What OS > > are you on? Looks like the unix code could be ported to the Mac easily. > > Linux chrisT520 3.2.0-32-generic #51-Ubuntu SMP Wed Sep 26 21:33:09 > UTC 2012 x86_64 x86_64 x86_64 GNU/Linux > > So, after several hours top still shows >500MB. Will it ever go back > down to the level reported by vm-parameters [1,2 or 3]? > I'm not sure. It all depends on the useMmap variable in the linux vm. If it is non-zero then a cursory reading of the source says that yes, the memory should be returned. -- best, Eliot

1 0

Re: [Pharo-project] Mariano's VM-building instructions don't seem to work
by Igor Stasenko 19 Oct '12

19 Oct '12

On 19 October 2012 18:40, Craig Latta <craig(a)netjam.org> wrote: > > Hi all-- > > The Cog-building instructions at [1] don't seem to work: > > *** > > CMake Error at CMakeLists.txt:46 (add_executable): > Cannot find source file: > > > /Users/craig/me/behavior/spoon/processor/kernel/cog-2012-10-19/blessed/macbuild/resources/ProjectBuilder/MainMenu.nib > > *** > > Hack that one and get: > > *** > > CMake Error at HostWindowPlugin/CMakeLists.txt:17 (add_library): > Cannot find source file: > > > /Users/craig/me/behavior/spoon/processor/kernel/cog-2012-10-19/blessed/platforms/iOS/vm/iPhone/plugins/HostWindowPlugin/sqMacHostWindow.c > > *** > > Hack that one and get: > > CMake Error at CroquetPlugin/CMakeLists.txt:17 (add_library): > Cannot find source file: > > > /Users/craig/me/behavior/spoon/processor/kernel/cog-2012-10-19/blessed/platforms/Cross/plugins/CroquetPlugin/tribox.c > Craig, that probably a sign that you using wrong version of CMakeVMMaker package not one which is used for the sources committed in git. For that there is codegen-scripts/LoadVMMaker.st script which loads exact version of all packages used to build VM. We usually don't commit code without changing LoadVMMaker.st, and making sure it builds VM with that version. > *** > > There is no file called “tribox.c”. Now what? > > > thanks! > > -C > > [1] > http://marianopeck.wordpress.com/2011/04/10/building-the-vm-from-scratch-us… > > -- > Craig Latta > www.netjam.org/resume > +31 6 2757 7177 > + 1 415 287 3547 (no SMS) > > -- Best regards, Igor Stasenko.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2012