Merge branch 'master' of github.com:Programming-Systems-Lab/chroniclerj

jon-bell · jon-bell · commit c2261028c6b8 · 2012-12-13T18:33:22.000-05:00
Conflicts:
	Code/ChroniclerJ/src/edu/columbia/cs/psl/chroniclerj/CloningUtils.java
	Code/ChroniclerJ/src/edu/columbia/cs/psl/chroniclerj/replay/NonDeterministicReplayMethodVisitor.java
diff --git a/Code/ChroniclerJ/META-INF/MANIFEST.MF b/Code/ChroniclerJ/META-INF/MANIFEST.MF
@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
 Created-By: 1.6.0_06 (Sun Microsystems Inc.)
 Main-Class: edu.columbia.cs.psl.chroniclerj.Main
-Class-Path: ./
 
diff --git a/Code/ChroniclerJ/jar-descriptor.jardesc b/Code/ChroniclerJ/jar-descriptor.jardesc
diff --git a/Code/ChroniclerJ/lib/asm-license b/Code/ChroniclerJ/lib/asm-license
@@ -0,0 +1,29 @@
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Code/ChroniclerJ/lib/asm-src.zip b/Code/ChroniclerJ/lib/asm-src.zip
diff --git a/Code/ChroniclerJ/license.md b/Code/ChroniclerJ/license.md
@@ -0,0 +1,19 @@
+This software is released under the MIT license:
+
+Copyright © 2012, by The Trustees of Columbia University in the City of New York.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+This project makes use of the following libraries:
+* [ASM](http://asm.ow2.org/license.html), (c) 2000-2011 INRIA, France Telecom, [license](http://asm.ow2.org/license.html)
+* [Cloning](https://code.google.com/p/cloning/), (c) 2009 Konstantinos Kougios, released under the Apache License 2.0
+* [KXML2](http://kxml.sourceforge.net/kxml2/), (c) 1999-2005, Stefan Haustein, released under the BSD license
+* [Objenesis](http://code.google.com/p/objenesis/), © 2006-2012, Joe Walnes, Henri Tremblay and Leonardo Mesquita, released under the Apache License 2.0
+* [Log4j](http://logging.apache.org/log4j/), (c) 1999-2012, Apache Software Foundation, released under the Apache License 2.0
+* [XStream](http://xstream.codehaus.org/, (c) 2003-2006, Joe Walnes and (c) 2006-2009, 2011 XStream Committers, released under [a BSD license](http://xstream.codehaus.org/license.html)
diff --git a/Code/ChroniclerJ/makeJar.sh b/Code/ChroniclerJ/makeJar.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+jar cmf META-INF/MANIFEST.MF chroniclerj.jar META-INF/ listenerMethods.txt nondeterministic-methods.txt -C bin .
diff --git a/Code/ChroniclerJ/src/edu/columbia/cs/psl/chroniclerj/Main.java b/Code/ChroniclerJ/src/edu/columbia/cs/psl/chroniclerj/Main.java
@@ -21,7 +21,7 @@ public static void main(String[] args) {
 			instrumenterArgs[1] = args[2];
 			instrumenterArgs[2] = args[1];
 			for (int i = 4; i < args.length; i++) {
-				instrumenterArgs[i] = args[i];
+				instrumenterArgs[i-1] = args[i];
 			}
 			Instrumenter._main(instrumenterArgs);
 			Replayer._main(new String[] { args[1], args[3] });
diff --git a/Code/ChroniclerJ/unpackLibs.sh b/Code/ChroniclerJ/unpackLibs.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+cp lib/asm-all-4.0.jar bin/; cp lib/kxml2-2.3.0.jar bin/; cp lib/log4j-1.2.16.jar bin/; cp lib/objenesis-1.2.jar bin/; cp lib/xstream-1.4.2.jar bin/;
+cd bin
+unzip -n asm-all-4.0.jar; unzip -n kxml2-2.3.0.jar; unzip -n log4j-1.2.16.jar; unzip -n objenesis-1.2.jar; unzip -n xstream-1.4.2.jar
+rm asm-all-4.0.jar; rm kxml2-2.3.0.jar; rm log4j-1.2.16.jar; rm objenesis-1.2.jar; rm xstream-1.4.2.jar; rm -rf META-INF/
diff --git a/Code/Nondeterminism Detector/license.md b/Code/Nondeterminism Detector/license.md
@@ -0,0 +1,19 @@
+This software is released under the MIT license:
+
+Copyright © 2012, by The Trustees of Columbia University in the City of New York.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+This project makes use of the following libraries:
+* [ASM](http://asm.ow2.org/license.html), (c) 2000-2011 INRIA, France Telecom, [license](http://asm.ow2.org/license.html)
+* [Cloning](https://code.google.com/p/cloning/), (c) 2009 Konstantinos Kougios, released under the Apache License 2.0
+* [KXML2](http://kxml.sourceforge.net/kxml2/), (c) 1999-2005, Stefan Haustein, released under the BSD license
+* [Objenesis](http://code.google.com/p/objenesis/), © 2006-2012, Joe Walnes, Henri Tremblay and Leonardo Mesquita, released under the Apache License 2.0
+* [Log4j](http://logging.apache.org/log4j/), (c) 1999-2012, Apache Software Foundation, released under the Apache License 2.0
+* [XStream](http://xstream.codehaus.org/, (c) 2003-2006, Joe Walnes and (c) 2006-2009, 2011 XStream Committers, released under [a BSD license](http://xstream.codehaus.org/license.html)
diff --git a/README.md b/README.md
@@ -1,7 +1,80 @@
 ChroniclerJ [Chronicler implemented in Java]
 =======
 
-Lightweight Recording of Nondeterministic Inputs to Reproduce Field Failures
+*Lightweight Recording of Nondeterministic Inputs to Reproduce Field Failures*
 
-For more information, see our Technical Report:
-http://mice.cs.columbia.edu/getTechreport.php?techreportID=1512&format=pdf
+**ChroniclerJ** is a system for recording buggy program executions in the field and reproducing them in the lab. **ChroniclerJ** is our Java implementation of **Chronicler**, a generalized record and replay approach for VM-based languages.
+
+This repository contains the source and a [runnable binary](https://github.com/Programming-Systems-Lab/chroniclerj/blob/master/chroniclerj-0.4.1.jar) for **ChroniclerJ**.
+
+###For more information
+Please see our Technical Report:
+<http://mice.cs.columbia.edu/getTechreport.php?techreportID=1512&format=pdf>, or email [Jonathan Bell](mailto:jbell@cs.columbia.edu)
+
+Running
+-----
+### Instrumenting your code
+Before deploying your code, you need to run the **ChroniclerJ** instrumenter, which will produce two copies of your program: one for deployment (with logging code), and one for replay purposes (with code that reads back from the log).
+
+To run the instrumenter, use the command `java -jar chroniclerj-0.4.1.jar -instrument {-mxLogN} input ouputLocationDeploy outputLocationReplay`, where:
+* `{-mxLogN}` is an optional parameter indiciating that at most `N` items should be stored in the in-memory logfile before it is flushed to disk
+* `input` is the path that contains the .class files, .jar files, etc that need to be instrumented (e.g. what you would be deploying normally)
+* `outputLocationDeploy` is where you would like the generated code (for deployment) to be placed
+* `outputLocationReplay` is where you would like the generated code (for running replays) to be placed
+
+It is important that *all* libraries that you plan to deploy with your application are instrumented. We suggest running the instrumenter at the top level folder that you were going to deploy, which might contain several jar files, several class files, etc.
+
+### Collecting test cases
+Deploy your code as you normally would, but deploy the code that was instrumented and placed in `outputLocationDeploy` rather than your original, uninstrumented code. Make sure that the **ChroniclerJ** jar is in your classpath too.
+
+When an uncaught exception ocurrs, **ChroniclerJ** generates a test case. You can manually invoke this process (e.g. from your own exception handler) by calling the method `ChroniclerJExceptionRunner.genTestCase()`. Users are notified that a test case was generated, which is placed in the current working directory and has the name format chroniclerj-crash-*currenttime*.test. The test case file contains all logs necessary to replay the execution.
+
+### Replaying test cases
+To replay the failed executions, run the command `java -jar chroniclerj-0.4.1.jar -replay testCase {classpath}`, where
+* `testCase` is the test case to run
+* `{classpath}` is a space-delimited classpath passed to your program when it starts to replay
+
+Building
+-----
+**ChroniclerJ** is an eclipse project, and should simply be added to eclipse, and built as a Java project.
+
+###Packaging
+To create the **ChroniclerJ** jar, first run the `unpackLibs.sh` command to unpack the libraries that **ChroniclerJ** depends on, then `makeJar.sh` to generate a jar file with **ChroniclerJ** and its libraries embedded.
+
+License
+------
+This software is released under the MIT license.
+
+Copyright (c) 2012, by The Trustees of Columbia University in the City of New York.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Acknowledgements
+-----
+This project makes use of the following libraries:
+* [ASM](http://asm.ow2.org/license.html), (c) 2000-2011 INRIA, France Telecom, [license](http://asm.ow2.org/license.html)
+* [Cloning](https://code.google.com/p/cloning/), (c) 2009 Konstantinos Kougios, released under the Apache License 2.0
+* [KXML2](http://kxml.sourceforge.net/kxml2/), (c) 1999-2005, Stefan Haustein, released under the BSD license
+* [Objenesis](http://code.google.com/p/objenesis/), © 2006-2012, Joe Walnes, Henri Tremblay and Leonardo Mesquita, released under the Apache License 2.0
+* [Log4j](http://logging.apache.org/log4j/), (c) 1999-2012, Apache Software Foundation, released under the Apache License 2.0
+* [XStream](http://xstream.codehaus.org/, (c) 2003-2006, Joe Walnes and (c) 2006-2009, 2011 XStream Committers, released under [a BSD license](http://xstream.codehaus.org/license.html)
+
+The authors of this software are [Jonathan Bell](http://jonbell.net), [Nikhil Sarda](https://github.com/diffoperator/) and [Gail Kaiser](http://www.cs.columbia.edu/~kaiser/). The authors are members of the [Programming Systems Laboratory](http://www.psl.cs.columbia.edu/), funded in part by NSF CCF-1161079, NSF CNS-0905246 and NIH 2 U54 CA121852-06.
diff --git a/chroniclerj-0.4.1.jar b/chroniclerj-0.4.1.jar
diff --git a/chroniclerj-0.4.jar b/chroniclerj-0.4.jar

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/bin/sh`
	`2`	`+jar cmf META-INF/MANIFEST.MF chroniclerj.jar META-INF/ listenerMethods.txt nondeterministic-methods.txt -C bin .`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static void main(String[] args) {`
`21`	`21`	`instrumenterArgs[1] = args[2];`
`22`	`22`	`instrumenterArgs[2] = args[1];`
`23`	`23`	`for (int i = 4; i < args.length; i++) {`
`24`		`- instrumenterArgs[i] = args[i];`
	`24`	`+ instrumenterArgs[i-1] = args[i];`
`25`	`25`	`}`
`26`	`26`	`Instrumenter._main(instrumenterArgs);`
`27`	`27`	`Replayer._main(new String[] { args[1], args[3] });`