Vm-dev April 2010

vm-dev@lists.squeakfoundation.org

33 participants
95 discussions

[commit] r2163 - Add ioMicroSeconds, sqUnixUtcWithOffset.
by commits＠squeakvm.org 02 Apr '10

02 Apr '10

Author: piumarta Date: 2010-04-01 19:55:01 -0700 (Thu, 01 Apr 2010) New Revision: 2163 Modified: trunk/platforms/unix/vm/sqUnixMain.c Log: Add ioMicroSeconds, sqUnixUtcWithOffset. Modified: trunk/platforms/unix/vm/sqUnixMain.c =================================================================== --- trunk/platforms/unix/vm/sqUnixMain.c 2010-04-02 02:54:29 UTC (rev 2162) +++ trunk/platforms/unix/vm/sqUnixMain.c 2010-04-02 02:55:01 UTC (rev 2163) @@ -27,7 +27,7 @@ /* Author: Ian Piumarta <ian.piumarta(a)squeakland.org> * - * Last edited: 2009-09-14 14:03:15 by piumarta on ubuntu.piumarta.com + * Last edited: 2010-04-01 13:43:17 by piumarta on emilia-2.local */ #include "sq.h" @@ -193,6 +193,35 @@ return ioMSecs(); /* this already to the nearest millisecond */ } +sqLong ioMicroSeconds(void) +{ + struct timeval now; + sqLong microSecs; + gettimeofday(&now, 0); + if ((now.tv_usec -= startUpTime.tv_usec) < 0) { + now.tv_usec += 1000000; + now.tv_sec -= 1; + } + now.tv_sec -= startUpTime.tv_sec; + microSecs= now.tv_usec; + microSecs= microSecs + now.tv_sec * 1000000; + return microSecs; +} + +/* implementation of ioUtcWithOffset(), defined in config.h to +/* override default definition in src/vm/interp.h + */ +sqInt sqUnixUtcWithOffset(sqLong *microSeconds, int *offset) +{ + struct timeval timeval; + if (gettimeofday(&timeval, NULL) == -1) return -1; + time_t seconds= timeval.tv_sec; + suseconds_t usec= timeval.tv_usec; + *microSeconds= seconds * 1000000 + usec; + *offset= localtime(&seconds)->tm_gmtoff; + return 0; +} + time_t convertToSqueakTime(time_t unixTime) { #ifdef HAVE_TM_GMTOFF @@ -221,7 +250,7 @@ /* copy src filename to target, if src is not an absolute filename, * prepend the cwd to make target absolute - */ + */ static void pathCopyAbs(char *target, const char *src, size_t targetSize) { if (src[0] == '/')

1 0

[commit] r2162 - Prepend CMAKE_ARCH_FLAGS to CMAKE_C_FLAGS if defined. Define ioMicroSecondClock and ioUtcWithOffset.
by commits＠squeakvm.org 02 Apr '10

02 Apr '10

Author: piumarta Date: 2010-04-01 19:54:29 -0700 (Thu, 01 Apr 2010) New Revision: 2162 Modified: trunk/platforms/unix/CMakeLists.txt Log: Prepend CMAKE_ARCH_FLAGS to CMAKE_C_FLAGS if defined. Define ioMicroSecondClock and ioUtcWithOffset. Modified: trunk/platforms/unix/CMakeLists.txt =================================================================== --- trunk/platforms/unix/CMakeLists.txt 2010-04-01 19:10:46 UTC (rev 2161) +++ trunk/platforms/unix/CMakeLists.txt 2010-04-02 02:54:29 UTC (rev 2162) @@ -1,6 +1,6 @@ # Yes, it's true: you can write makefiles in COBOL. # -# Last edited: 2009-08-27 19:30:47 by piumarta on emilia-2.local +# Last edited: 2010-04-01 19:47:10 by piumarta on ubuntu PROJECT (squeak) @@ -83,6 +83,10 @@ SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_RELEASE}") ENDIF (NOT CMAKE_C_FLAGS) +IF (CMAKE_ARCH_FLAGS) + SET (CMAKE_C_FLAGS "${CMAKE_ARCH_FLAGS} ${CMAKE_C_FLAGS}") +ENDIF (CMAKE_ARCH_FLAGS) + MESSAGE (STATUS "Using CFLAGS ${CMAKE_C_FLAGS}") MACRO (USE_LIBRARY lib) @@ -100,6 +104,12 @@ SET (UNIX 1) CONFIG_DEFINE (UNIX) +SET (ioMicroSecondClock ioMicroSeconds) +CONFIG_DEFINE (ioMicroSecondClock) + +SET (ioUtcWithOffset sqUnixUtcWithOffset) +CONFIG_DEFINE (ioUtcWithOffset) + SET (CMAKE_SKIP_BUILD_RPATH TRUE) SET (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) SET (CMAKE_INSTALL_RPATH "")

1 0

[commit] r2161 - Fix sqFileAtEnd logic to test if the file position is >= file size instead of ==.
by commits＠squeakvm.org 01 Apr '10

01 Apr '10

Author: andreas Date: 2010-04-01 12:10:46 -0700 (Thu, 01 Apr 2010) New Revision: 2161 Modified: trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c Log: Fix sqFileAtEnd logic to test if the file position is >= file size instead of ==. Modified: trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c =================================================================== --- trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2010-04-01 19:09:26 UTC (rev 2160) +++ trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2010-04-01 19:10:46 UTC (rev 2161) @@ -114,7 +114,7 @@ /* Return true if the file's read/write head is at the end of the file. */ if (!sqFileValid(f)) return interpreterProxy->success(false); - return ftell(getFile(f)) == getSize(f); + return ftell(getFile(f)) >= getSize(f); } sqInt sqFileClose(SQFile *f) {

1 0

[commit] r2160 - Fix sqFileAtEnd logic to test if the file position is >= file size instead of ==.
by commits＠squeakvm.org 01 Apr '10

01 Apr '10

Author: andreas Date: 2010-04-01 12:09:26 -0700 (Thu, 01 Apr 2010) New Revision: 2160 Modified: trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c Log: Fix sqFileAtEnd logic to test if the file position is >= file size instead of ==. Modified: trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c =================================================================== --- trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2010-03-30 21:54:16 UTC (rev 2159) +++ trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2010-04-01 19:09:26 UTC (rev 2160) @@ -79,7 +79,7 @@ if (!sqFileValid(f)) FAIL(); ofs.offset = 0; ofs.dwLow = SetFilePointer(FILE_HANDLE(f), 0, &ofs.dwHigh, FILE_CURRENT); - return ofs.offset == sqFileSize(f); + return ofs.offset >= sqFileSize(f); } sqInt sqFileClose(SQFile *f) {

1 0

VMMaker commit messages?
by Andreas Raab 01 Apr '10

01 Apr '10

Hi - Does anyone know how to turn on commit messages for VMMaker on Squeaksource? I feel like really missing out without them :-) Since the traffic should be fairly low volume I also don't see an issue with overload of the mailing list but it would make for a real good companion to the SVN commit logs. Thanks! - Andreas

4 5

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2010