[Vm-dev] [commit][3232] Fix stupid, stupid bug in copying vm profile samples between buffers when the

commits at squeakvm.org commits at squeakvm.org
Mon Jan 19 03:36:08 UTC 2015


Revision: 3232
Author:   eliot
Date:     2015-01-18 19:36:05 -0800 (Sun, 18 Jan 2015)
Log Message:
-----------
Fix stupid, stupid bug in copying vm profile samples between buffers when the
circular buffer index has wrapped.

No longer build the newspeak.cog.v3 installers.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/makeproductinstall
    branches/Cog/build.win32x86/makeproductinstall
    branches/Cog/platforms/unix/vm/sqUnixVMProfile.c

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/build.macos32x86/makeproductinstall
===================================================================
--- branches/Cog/build.macos32x86/makeproductinstall	2015-01-18 01:07:07 UTC (rev 3231)
+++ branches/Cog/build.macos32x86/makeproductinstall	2015-01-19 03:36:05 UTC (rev 3232)
@@ -6,7 +6,7 @@
 	| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
 TAG=`date +%y.%U.`$REV
 set -- Newspeak\ Virtual\ Machine	Newspeak\ Spur\ Virtual\ Machine
-for td in newspeak.cog.v3 newspeak.cog.spur; do
+for td in newspeak.cog.spur; do
 	d=$td/installer
 	PRODUCT=$1-$TAG.dmg
 	if test -d "$d"; then

Modified: branches/Cog/build.win32x86/makeproductinstall
===================================================================
--- branches/Cog/build.win32x86/makeproductinstall	2015-01-18 01:07:07 UTC (rev 3231)
+++ branches/Cog/build.win32x86/makeproductinstall	2015-01-19 03:36:05 UTC (rev 3232)
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap 'exit 2' HUP INT PIPE TERM
-for d in newspeak.cog.spur/installer newspeak.cog.v3/installer; do
+for d in newspeak.cog.spur/installer; do
 	if test -d "$d"; then
 		(cd $d;make)
 	else


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Sat Jan 17 17:06:40 PST 2015
   + Sun Jan 18 19:36:21 PST 2015

Modified: branches/Cog/platforms/unix/vm/sqUnixVMProfile.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixVMProfile.c	2015-01-18 01:07:07 UTC (rev 3231)
+++ branches/Cog/platforms/unix/vm/sqUnixVMProfile.c	2015-01-19 03:36:05 UTC (rev 3232)
@@ -250,7 +250,7 @@
 	memcpy(sampleBuffer,
 		   pc_buffer + pc_buffer_index,
 		   (pc_buffer_size - pc_buffer_index) * sizeof(pctype));
-	memcpy((pctype *)sampleBuffer + pc_buffer_index,
+	memcpy((pctype *)sampleBuffer + (pc_buffer_size - pc_buffer_index),
 		   pc_buffer,
 		   pc_buffer_index * sizeof(pctype));
 	return pc_buffer_size;



More information about the Vm-dev mailing list