JVM Snapshot Implementation

.gitignore

@@ -38,6 +38,7 @@ SourceJars
 src/ee/org_voltdb_jni_ExecutionEngine.h
 src/ee/org_voltdb_utils_DBBPool.h
 src/ee/org_voltdb_utils_ThreadUtils.h
+src/ee/org_voltdb_utils_ProcessUtils.h
 
 ## -------------------------------
 ## Catalog Compiler Artifacts

build-common.xml

@@ -215,4 +215,7 @@
 <arg value="site.pool_scale_factor=${site.pool_scale_factor}" />
 <arg value="site.pool_profiling=${site.pool_profiling}" />
 <arg value="site.pool_pathestimators_idle=${site.pool_pathestimators_idle}" />
+<arg value="site.jvmsnapshot_enable=${site.jvmsnapshot_enable}" />
+<arg value="site.jvmsnapshot_interval=${site.jvmsnapshot_interval}" />
+<arg value="site.jvmsnapshot_start=${site.jvmsnapshot_start}" />
 

build.xml

@@ -765,6 +765,7 @@ NATIVE EE STUFF
     <delete file="${src.ee.dir}/org_voltdb_jni_ExecutionEngine.h" />
     <delete file="${src.ee.dir}/org_voltdb_utils_DBBPool.h" />
     <delete file="${src.ee.dir}/org_voltdb_utils_ThreadUtils.h" />
+	<delete file="${src.ee.dir}/org_voltdb_utils_ProcessUtils.h" />
     <move
         file='${build.dir}/org_voltdb_jni_ExecutionEngine.h'
         todir='${src.ee.dir}'
@@ -777,6 +778,10 @@ NATIVE EE STUFF
         file='${build.dir}/org_voltdb_utils_ThreadUtils.h'
         todir='${src.ee.dir}'
     />
+    <move
+        file='${build.dir}/org_voltdb_utils_ProcessUtils.h'
+        todir='${src.ee.dir}'
+    />
 </target>
 
 <target name='uptodate_jni_h.check' depends='jnicompile_temp'>
@@ -794,13 +799,19 @@ NATIVE EE STUFF
                 file1="${src.ee.dir}/org_voltdb_utils_ThreadUtils.h"
                 file2="${build.dir}/org_voltdb_utils_ThreadUtils.h"
             />
+            <filesmatch
+                file1="${src.ee.dir}/org_voltdb_utils_ProcessUtils.h"
+                file2="${build.dir}/org_voltdb_utils_ProcessUtils.h"
+            />
         </and>
     </condition>
 </target>
 
 <target name='jnicompile_temp'>
     <delete file="${build.dir}/org_voltdb_jni_ExecutionEngine.h"/>
     <delete file="${build.dir}/org_voltdb_utils_DBBPool.h" />
+	<delete file="${build.dir}/org_voltdb_utils_ThreadUtils.h" />
+	<delete file="${build.dir}/org_voltdb_utils_ProcessUtils.h" />
     <javah
         classpathref="project.classpath"
         force="yes"
@@ -822,6 +833,13 @@ NATIVE EE STUFF
         class="org.voltdb.utils.ThreadUtils"
         destdir="${build.dir}"
     />
+    <javah
+        classpathref="project.classpath"
+        force="yes"
+        verbose="yes"
+        class="org.voltdb.utils.ProcessUtils"
+        destdir="${build.dir}"
+    />
 </target>
 
 <target name="eecheck" depends="ee, eecheck-build"

src/ee/indexes/indexkey.h

@@ -158,7 +158,7 @@ class IntsKey {
              * in this next uint64_t.
              */
             if (intraKeyOffset < 0) {
-                intraKeyOffset = sizeof(uint64_t) - 1;
+                intraKeyOffset = static_cast<int>(sizeof(uint64_t)) - 1;
                 keyOffset++;
             }
         }
@@ -174,7 +174,7 @@ class IntsKey {
             retval |= (0xFF & (data[keyOffset] >> (intraKeyOffset * 8))) << (ii * 8);
             intraKeyOffset--;
             if (intraKeyOffset < 0) {
-                intraKeyOffset = sizeof(uint64_t) - 1;
+                intraKeyOffset = static_cast<int>(sizeof(uint64_t)) - 1;
                 keyOffset++;
             }
         }
@@ -184,7 +184,7 @@ class IntsKey {
     std::string debug( const voltdb::TupleSchema *keySchema) const {
         std::ostringstream buffer;
         int keyOffset = 0;
-        int intraKeyOffset = sizeof(uint64_t) - 1;
+        int intraKeyOffset = static_cast<int>(sizeof(uint64_t)) - 1;
         const int columnCount = keySchema->columnCount();
         for (int ii = 0; ii < columnCount; ii++) {
             switch(keySchema->columnType(ii)) {
@@ -222,7 +222,7 @@ class IntsKey {
         const TupleSchema *keySchema = tuple->getSchema();
         const int columnCount = keySchema->columnCount();
         int keyOffset = 0;
-        int intraKeyOffset = sizeof(uint64_t) - 1;
+        int intraKeyOffset = static_cast<int>(sizeof(uint64_t)) - 1;
         for (int ii = 0; ii < columnCount; ii++) {
             switch(keySchema->columnType(ii)) {
             case voltdb::VALUE_TYPE_BIGINT: {
@@ -260,7 +260,7 @@ class IntsKey {
         ::memset(data, 0, keySize * sizeof(uint64_t));
         const int columnCount = keySchema->columnCount();
         int keyOffset = 0;
-        int intraKeyOffset = sizeof(uint64_t) - 1;
+        int intraKeyOffset = static_cast<int>(sizeof(uint64_t)) - 1;
         for (int ii = 0; ii < columnCount; ii++) {
             switch(keySchema->columnType(ii)) {
             case voltdb::VALUE_TYPE_BIGINT: {

src/ee/voltdbjni.cpp

@@ -94,6 +94,7 @@
 #include "org_voltdb_jni_ExecutionEngine.h" // the header file output by javah
 #include "org_voltdb_utils_DBBPool.h" //Utility method for DBBContainer
 #include "org_voltdb_utils_ThreadUtils.h" // the header file output by javah
+#include "org_voltdb_utils_ProcessUtils.h" // the header file output by javah
 
 #include "boost/shared_ptr.hpp"
 #include "boost/scoped_array.hpp"
@@ -1273,6 +1274,26 @@ SHAREDLIB_JNIEXPORT jint JNICALL Java_org_voltdb_utils_ThreadUtils_getNumCores
     return static_cast<jint>(NUM_PROCS);
 }
 
+/*
+ * Class:     org_voltdb_utils_ProcessUtils
+ * Method:    fork
+ * Signature: ()I
+ */
+SHAREDLIB_JNIEXPORT jint JNICALL Java_org_voltdb_utils_ProcessUtils_fork
+  (JNIEnv *env, jclass clazz) {
+    return (fork());
+}
+
+/*
+ * Class:     org_voltdb_utils_ProcessUtils
+ * Method:    kill
+ * Signature: ()I
+ */
+SHAREDLIB_JNIEXPORT void JNICALL Java_org_voltdb_utils_ProcessUtils_kill
+  (JNIEnv *env, jclass clazz, jint pid) {
+    kill(static_cast<int>(pid), SIGKILL);
+}
+
 // ----------------------------------------------------------------------------
 // READ/WRITE TRACKING
 // ----------------------------------------------------------------------------

src/frontend/edu/brown/catalog/FixCatalog.java

@@ -102,6 +102,7 @@ public static Catalog updateCatalog(Catalog catalog, ClusterConfiguration cc) {
 
             int proc_port = HStoreConstants.DEFAULT_PORT;
             int messenger_port = proc_port + HStoreConstants.MESSENGER_PORT_OFFSET;
+            int jvmsnapshot_port = proc_port + HStoreConstants.JVMSNAPSHOT_PORT_OFFSET;
 
             // Now create the sites for this host
             for (Integer siteid : cc.getSites(host)) {
@@ -113,6 +114,7 @@ public static Catalog updateCatalog(Catalog catalog, ClusterConfiguration cc) {
                 catalog_site.setHost(catalog_host);
                 catalog_site.setProc_port(proc_port++);
                 catalog_site.setMessenger_port(messenger_port++);
+                catalog_site.setJVMSnapshot_port(jvmsnapshot_port++);
 
                 // Add all the partitions
                 for (Integer partition_id : cc.getPartitionIds(host, siteid)) {

src/frontend/edu/brown/hstore/HStoreConstants.java

@@ -36,6 +36,8 @@ public abstract class HStoreConstants {
 
     public static final int MESSENGER_PORT_OFFSET = 10000;
 
+    public static final int JVMSNAPSHOT_PORT_OFFSET = 20000;
+
     // ----------------------------------------------------------------------------
     // THREAD NAMES
     // ----------------------------------------------------------------------------