svn commit: r1210596 - /incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/

[vi...@apache.org]

Author: vines
Date: Mon Dec  5 19:51:28 2011
New Revision: 1210596

URL: http://svn.apache.org/viewvc?rev=1210596&view=rev
Log:
fixes ACCUMULO-207 - proper naming for native mlocks

Added:
    incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.cc   (contents, props changed)
      - copied, changed from r1210590, incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/accumulo_server_tabletserver_MLock.cc
    incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h   (with props)
Removed:
    incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/accumulo_server_tabletserver_MLock.cc
    incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/accumulo_server_tabletserver_MLock.h
Modified:
    incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile

Modified: incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/c%2B%2B/mlock/Makefile?rev=1210596&r1=1210595&r2=1210596&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile Mon Dec  5 19:51:28 2011
@@ -15,7 +15,7 @@
 
 LIB=MLock
 SRCS=$(filter-out test.cc,$(wildcard *.cc))
-HDRS=$(wildcard *.h) accumulo_server_tabletserver_$(LIB).h
+HDRS=$(wildcard *.h) org_apache_accumulo_server_tabletserver_$(LIB).h
 CXX=g++
 
 ifeq ($(shell uname),Linux)
@@ -36,7 +36,7 @@ all : $(INSTALLED_LIBS)
 clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
-accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
+org_apache_accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
 	javah -classpath ../../../../../../lib/accumulo-server-1.3.5-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)

Copied: incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.cc (from r1210590, incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/accumulo_server_tabletserver_MLock.cc)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/c%2B%2B/mlock/org_apache_accumulo_server_tabletserver_MLock.cc?p2=incubator/accumulo/branches/1.3/src/server/src/main/c%2B%2B/mlock/org_apache_accumulo_server_tabletserver_MLock.cc&p1=incubator/accumulo/branches/1.3/src/server/src/main/c%2B%2B/mlock/accumulo_server_tabletserver_MLock.cc&r1=1210590&r2=1210596&rev=1210596&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/accumulo_server_tabletserver_MLock.cc (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.cc Mon Dec  5 19:51:28 2011
@@ -14,7 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#include "accumulo_server_tabletserver_MLock.h"
+#include "org_apache_accumulo_server_tabletserver_MLock.h"
 
 #include <unistd.h>
 

Propchange: incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.cc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/c%2B%2B/mlock/org_apache_accumulo_server_tabletserver_MLock.h?rev=1210596&view=auto
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h (added)
+++ incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h Mon Dec  5 19:51:28 2011
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_apache_accumulo_server_tabletserver_MLock */
+
+#ifndef _Included_org_apache_accumulo_server_tabletserver_MLock
+#define _Included_org_apache_accumulo_server_tabletserver_MLock
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_apache_accumulo_server_tabletserver_MLock
+ * Method:    lockMemoryPages
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_accumulo_server_tabletserver_MLock_lockMemoryPages
+  (JNIEnv *, jclass);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

Propchange: incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h
------------------------------------------------------------------------------
    svn:eol-style = native