From: Martin Zaun Date: January 11 2011 8:10pm Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4050) List-Archive: http://lists.mysql.com/commits/128464 Message-Id: <201101112009.p0BJuE9E006418@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0801228742==" --===============0801228742== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/mz/mysql/ndb-7.1-dbg64/ based on revid:martin.zaun@stripped 4050 Martin Zaun 2011-01-11 crund - added nWarmupRuns property to ResultProcessor added: storage/ndb/test/crund/config_samples/crundResult.properties modified: storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java === added file 'storage/ndb/test/crund/config_samples/crundResult.properties' --- a/storage/ndb/test/crund/config_samples/crundResult.properties 1970-01-01 00:00:00 +0000 +++ b/storage/ndb/test/crund/config_samples/crundResult.properties 2011-01-11 20:09:57 +0000 @@ -0,0 +1,2 @@ +# the number of warmup iterations to be skipped for result aggregation +nWarmupRuns=5 === modified file 'storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java' --- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java 2011-01-11 17:40:55 +0000 +++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java 2011-01-11 20:09:57 +0000 @@ -121,8 +121,7 @@ public class ResultProcessor { // result processor settings protected final Properties props = new Properties(); - protected int warmupRuns; - protected int hotRuns; + protected int nWarmupRuns; // result processor resources protected ResultReporter reporter; @@ -169,7 +168,7 @@ public class ResultProcessor { } if (propFileNames.size() == 0) { - // XXX propFileNames.add("crundResult.properties"); + propFileNames.add("crundResult.properties"); } if (ilogFileNames.size() == 0) { @@ -223,6 +222,7 @@ public class ResultProcessor { int lineNo = 1; String line; + int nIgnored = nWarmupRuns; while (true) { line = ilog.readLine(); if (line == null) { @@ -280,7 +280,7 @@ public class ResultProcessor { + ": " + e); throw new ParseException(msg, 0); } - if (nTxOps == 0) { + if (nval == 1) { nTxOps = n; } else if (nTxOps != n) { String msg = ("line # " + lineNo @@ -289,7 +289,14 @@ public class ResultProcessor { + ", found: " + n); throw new ParseException(msg, 0); } - + + // skip warmup runs + if (nval <= nIgnored) { + nval--; + nIgnored--; + continue; + } + // parse values for (int i = 1; i < values.length; i++) { long l; @@ -396,10 +403,10 @@ public class ResultProcessor { final StringBuilder msg = new StringBuilder(); final String eol = System.getProperty("line.separator"); - warmupRuns = parseInt("warmupRuns", 0); - if (warmupRuns < 0) { - msg.append("[ignored] warmupRuns: " + warmupRuns + eol); - warmupRuns = 0; + nWarmupRuns = parseInt("nWarmupRuns", 0); + if (nWarmupRuns < 0) { + msg.append("[ignored] nWarmupRuns: " + nWarmupRuns + eol); + nWarmupRuns = 0; } if (msg.length() == 0) { @@ -414,7 +421,7 @@ public class ResultProcessor { protected void printProperties() { out.println(); out.println("result processor settings ..."); - out.println("warmupRuns: " + warmupRuns); + out.println("nWarmupRuns: " + nWarmupRuns); } // ---------------------------------------------------------------------- --===============0801228742== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/martin.zaun@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@stripped # target_branch: file:///Users/mz/mysql/ndb-7.1-dbg64/ # testament_sha1: 9fbd3d96ae53f0ecb196423cbc5d723bea3600f8 # timestamp: 2011-01-11 12:10:03 -0800 # base_revision_id: martin.zaun@stripped\ # 975v2mkepb47qr6r # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY0BnncAApn/gEVUQABYb/// UyNQmr////pQBU7m90PRRq51pByVeEkimRpT/KFP0U9PEmTTMpM9TQQAG0IeptqCURFPU/SZpR+m qY0mQAZMIyBiAAAiaZUfqI0aGRoAAaaAAA0NAAJFI0aCnoGqbEYie1J6j0Q9RmoaAaAAShBpNA0j QmmqZmpqb0U9BPUNGgAxBpOGBCuqobWtSug438DR7G0OJG0tf/rppHMnX3qSh+t4BdN0Fcekx0kI OibwlmSQpkYMQ7feseo72d97TFSn7krBCAB5RoxW6LmGgTolPXIExeEzWsWEZR40YcibW6JVjgnF BCDEX1YeEeQxhM6oM+gWBNkSmdEcgDM0llLq3d1XLq0zeLjmtPL2ymYLzfFgZgYbqqKNVoVxjLTB /O6RWUOJ/XcKRptPkHpFAXoBv9XWHeaG3X425aF+5ceXnQupVosQurjoNk90ibrihZGmYxGpkBgD RE7VTQUiaNHgRGCcVCYxSUiIG9gkl3qlDoUPnuIhxuuRDKA8PfhzwLgDymhzWJ6CHbMIgCgoiKIQ j9ROIgvBSj7+cj2T6sfpD8i2OTam3dU156kpjmpgbNCUzZJd286y4auUMytd7xkIMIEO4VJha5SE zJxbaPovuGTlCzLFiFJUQsnKMCIr2lJmcXqSKmD3QFuw36T8w1pOboQ2gzIWZiDQOtS8rOXEeeJi VUGMKFUNUmYlw5/YF/hsd0a4KVjjmRkZ4xPoDBgsSwAtyNLszLp1gZhbEpB/IYSkCcujOCW5Tt0D JoxCuqwH23PpaBDZdLBBVq7wrZTlGgaRMGa14SOr/gN0wvptbZazIa1HHM/M5qpeSd1M0vtgw/nK ngbJ5Z+Jwr2qZusx4Ad19AsPmXDz3V8R9JptWlnjqsxOpki8AV1klEHot3B0QVmI0HnTMOMDRRcx 8xB9gy2jV6DVQhU2tsbX9W8Yo3NcTAre4I4I0IyJyUTDp6ZB6EgJLl68OiC3nZiptiiatddx4XU0 1brUt5+AUPtpQoNXy/OZC4Ld76atD32dhEOk2aTscMdO4tNfuhisSIbcahLNt6yc494V2c7MhbEL JT5OcrWhgZDYnDo5bMZAkiwd0oTjZEFHLdzRcbo9mAsTqcWrjTI57URFOW0X2SLzVyG1HlsOYz21 p1UVBFE/Jgyclb8t5ZmrZp3U4QN2SLZ97jFgVCYbru4OfHonOWoWsz6YPlB2r9AyLRJE9C2WGcp0 IYkVHwNhmHsug2zGXiZ8NNaXBPv7KLmwizxgBkSHkGPuUE/RchpFw/RUqrmDixKVMJbUY5r0d8uv NTNeh1YD8iK9qCgwiB2rgBSaQOckGhFR7ANpudIThbAN2BWhMi1j5JZeGZpWMtBVDvDtO1Mhn0qm xT3F/qAyhZRQn01CU8qndNBCamQuY7nqlrmyMbL5QLatD8dqIGJlJNt8oTinaU5vkp5oJsHXiMcy y7eY4kyKZbBKkXphBxAlrX9Qq0PAIRTTnJHtx9xqYp2WnEE04KKC9kg9bpiUE3EIV5X99jsYMsv4 /QyA6Ba+wMntBhA8oe9IIL1TRWYG/di3RVfZntVYk/9MPljMBGhDEqIYCl3ARisEqBjGirCufbds ZvcToQzkKle9pYFgpIaBcvHIObB7CLETzhRdmumOlguXaX0ZMhREwiLEtRBUjiwlDJNuoQQkJRS4 gvEJRtyJcoYy/3FUvSapFBy8Cx7SULATQbbwGO8e/oglEpVH/4u5IpwoSEaAzzuA --===============0801228742==--