maria-developers team mailing list archive

[Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>]

At file:///Users/hakan/work/monty_program/mariadb-tools/

------------------------------------------------------------
revno: 12
revision-id: hakan@xxxxxxxxxxxx-20100303132525-euyw1c8whdv8fkjl
parent: hakan@xxxxxxxxxxxx-20100226170755-uucbsqe4n60b50c1
committer: Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>
branch nick: mariadb-tools
timestamp: Wed 2010-03-03 14:25:25 +0100
message:
  Extracted system depended variables into configuration files, which
  are identified by hostname.

=== added directory 'sysbench/conf'
=== added file 'sysbench/conf/au0013.inc'
--- a/sysbench/conf/au0013.inc	1970-01-01 00:00:00 +0000
+++ b/sysbench/conf/au0013.inc	2010-03-03 13:25:25 +0000
@@ -0,0 +1,28 @@
+# Configuration file for host: au0013
+# 
+# OS: Mac OS X 10.6.2
+# Platform: x86_64
+# CPU: Dual-core Intel Core 2 Duo @ 2.8GHz
+# RAM: 4GB
+# Disk(s): 1 x ST9500420ASG S-ATA
+
+#
+# Adjust the following paths according to your installation.
+#
+
+# We need sysbench >= v0.5.
+SYSBENCH='/usr/local/bin/sysbench'
+
+# We need bzr >= 1.18.1
+BZR='/usr/local/bin/bzr'
+
+# OProfile binaries.
+# There is no OProfile on Mac OS X.
+# TODO: Find OProfile equivalent for Mac OS X.
+OPCONTROL=''
+
+# System statistic binaries.
+IOSTAT='/usr/sbin/iostat'
+IOSTAT_DEVICE='disk0'
+# Note: sar works different on Mac OS X.
+SAR='/usr/bin/sar'

=== added file 'sysbench/conf/lu0012.inc'
--- a/sysbench/conf/lu0012.inc	1970-01-01 00:00:00 +0000
+++ b/sysbench/conf/lu0012.inc	2010-03-03 13:25:25 +0000
@@ -0,0 +1,25 @@
+# Configuration file for host: lu0012
+# 
+# OS: Ubuntu 9.10
+# Platform: x86_64
+# CPU: Dual-core Intel Core 2 Duo @ 2.80GHz
+# RAM: 4GB
+# Disk(s): 1 x HITACHI HTS722016K9SA00 S-ATA
+
+#
+# Adjust the following paths according to your installation.
+#
+
+# We need sysbench >= v0.5.
+SYSBENCH='/usr/local/bin/sysbench'
+
+# We need bzr >= 1.18.1
+BZR='/usr/bin/bzr'
+
+# OProfile binaries.
+OPCONTROL='/usr/bin/opcontrol'
+
+# System statistic binaries.
+IOSTAT='/usr/bin/iostat'
+IOSTAT_DEVICE='/dev/sda'
+SAR='/usr/bin/sar'

=== added file 'sysbench/conf/work.inc'
--- a/sysbench/conf/work.inc	1970-01-01 00:00:00 +0000
+++ b/sysbench/conf/work.inc	2010-03-03 13:25:25 +0000
@@ -0,0 +1,25 @@
+# Configuration file for host: work
+# 
+# OS: openSUSE 11.1 (x86_64)
+# Platform: x86_64
+# CPU: Two socket quad-core Intel Xeon @ 3.00GHz
+# RAM: 8GB
+# Disk(s): 1 x WDC WD2500JS-00NCB1 S-ATA
+
+#
+# Adjust the following paths according to your installation.
+#
+
+# We need sysbench >= v0.5.
+SYSBENCH='/usr/local/bin/sysbench'
+
+# We need bzr >= 1.18.1
+BZR='/usr/local/bin/bzr'
+
+# OProfile binaries.
+OPCONTROL='/usr/bin/opcontrol'
+
+# System statistic binaries.
+IOSTAT='/usr/bin/iostat'
+IOSTAT_DEVICE='/dev/sda'
+SAR='/usr/bin/sar'

=== modified file 'sysbench/run-sysbench.sh'
--- a/sysbench/run-sysbench.sh	2010-02-26 16:24:13 +0000
+++ b/sysbench/run-sysbench.sh	2010-03-03 13:25:25 +0000
@@ -34,17 +34,24 @@
 fi
 
 #
-# Binaries.
+# Read system dependent settings.
+#
+if [ ! -f conf/${HOSTNAME}.inc ]; then
+    echo "[ERROR]: Could not find config file: conf/${HOSTNAME}.conf."
+    echo "  Please create one."
+    
+    exit 1
+else
+    source conf/${HOSTNAME}.inc
+fi
+
+#
+# Binaries used after building from source. You do not have to
+# change these, except you exactly know what you are doing.
 #
 MYSQLADMIN='client/mysqladmin'
 
 #
-# Adjust the following paths according to your installation.
-#
-SYSBENCH='/usr/local/bin/sysbench'
-BZR='/usr/local/bin/bzr'
-
-#
 # Variables.
 #
 TEMP_DIR='/tmp'