Skip to content

Commit 12f6d53

Browse files
committed
Merge pull request #11 from GsDevKit/issue_10
Issue 10 ... collected changes for GemServer transaction model and tests
2 parents c836a06 + ce90c51 commit 12f6d53

File tree

443 files changed

+5378
-551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

443 files changed

+5378
-551
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ notifications:
55
urls:
66
- https://webhooks.gitter.im/e/dd28fc6ec3cc9c66b330 # GsDevKit/gsApplicationTools room
77
- https://webhooks.gitter.im/e/c59e6bffa0b41a693676 # GsDevKit/chat (public)
8-
- https://webhooks.gitter.im/e/869dcaa7f45f315db301 # GsDevKit room (private)
98
on_success: always # options: [always|never|change] default: always
109
on_failure: always # options: [always|never|change] default: always
1110
on_start: false # default: false
@@ -19,8 +18,8 @@ env:
1918
- ST=GemStone-3.0.1
2019
- ST=GemStone-3.1.0.6
2120
- ST=GemStone-3.2.0
22-
# - ST=GemStone-3.2.1
23-
# - ST=GemStone-3.2.2
21+
- ST=GemStone-3.2.1
22+
- ST=GemStone-3.2.2
2423
- ST=GemStone-3.2.3
2524

2625
install:

bin/gem.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#
2+
# standard gem.conf file for dev kit gems
3+
# minimum of 50M TOC for running GsDevKit
4+
#
5+
6+
GEM_TEMPOBJ_CACHE_SIZE = 50000;
7+
GEM_TEMPOBJ_POMGEN_PRUNE_ON_VOTE = 90;
8+

bin/startGemServerGem

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,33 @@
33
GemServer="$1"
44
Port="$2"
55

6+
set -e # exit on error
7+
8+
# Debugging controls - uncomemnt and edit debugging env vars as desired:
9+
10+
# The default behaviour is to delete this process's log file if it exits
11+
# normally. If you want to keep this process's log file even on normal exit
12+
# then uncomment the following
13+
#
14+
# export GEMSTONE_KEEP_LOG=1
15+
16+
# Print Smalltalk stack and instance counts when OutOfMemory error occurs
17+
#
18+
# export GS_DEBUG_VMGC_VERBOSE_OUTOFMEM=1
19+
20+
# --------------------------------
21+
# GS_DEBUG_VMGC_PRINT_MKSW_MEMORY_USED specifies a percent of memory
22+
# used threshold.
23+
# If the GS_DEBUG_VMGC_PRINT_MKSW_MEMORY_USED environment variable
24+
# is not defined, the default is 75 percent.
25+
# At the end of each mark sweep, if the percent used is greater than
26+
# this threshold, the markSweep is printed, the Smalltalk stack
27+
# is printed to stdout, and the threshold is raised by 5 percent. Thus in
28+
# situation producing error 4067, OutOfMemory, you should get several
29+
# Smalltalk stacks printed in the gem log file before the session dies.
30+
#
31+
# export GS_DEBUG_VMGC_PRINT_MKSW_MEMORY_USED=75
32+
633
if [ -s $GEMSTONE/seaside/etc/gemstone.secret ]; then
734
. $GEMSTONE/seaside/etc/gemstone.secret
835
else
@@ -11,14 +38,16 @@ else
1138
fi
1239

1340
if [ "${3}x" = "x" ] ; then
14-
ExeArg=
41+
ExeArg="-e $(dirname $0)/gem.conf"
1542
else
1643
ExeArg="-e $3"
1744
fi
1845

19-
echo "Starting $GemServer on $Port using $ExeConf ..."
46+
logFile="${GEMSTONE_LOGDIR}/${GemServer}_server-${Port}.log"
47+
48+
echo "Starting $GemServer on $Port exeConf: -$ExeConf- logFile: -$logFile-"
2049

21-
cat << EOF | nohup $GEMSTONE/bin/topaz -l ${ExeArg} 2>&1 >> ${GEMSTONE_LOGDIR}/${GemServer}_server-${Port}.log &
50+
cat << EOF | nohup $GEMSTONE/bin/topaz -l ${ExeArg} >> $logFile 2>&1 &
2251
2352
set user DataCurator pass $GEMSTONE_CURATOR_PASS gems $GEMSTONE_NAME
2453
@@ -32,11 +61,14 @@ run
3261
%
3362
3463
run
64+
| logEntry |
3565
System beginTransaction.
36-
(ObjectLogEntry
66+
(logEntry := ObjectLogEntry
3767
fatal: '${GemServer}_server_${Port}: topaz exit'
3868
object:
3969
'pid: ', (System gemVersionReport at: 'processId') printString) addToLog.
70+
(GemServerRegistry gemServerNamed: '$GemServer')
71+
ifNotNil: [:gemServer | gemServer crashLog add: (${Port}) asString -> logEntry ].
4072
System commitTransaction.
4173
%
4274

0 commit comments

Comments
 (0)