From: adam <adamansky@gmail.com>
Date: Sun, 3 Feb 2013 17:34:06 +0000 (+0700)
Subject: #10
X-Git-Tag: v1.2.12~484
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21ac1f50d320b2c8be4052fb602a08a375bf524f;p=platform%2Fupstream%2Fejdb.git

#10
---

diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index 4467249..f6e673a 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -1,8 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$/node" libraries="{Node.js v0.8.16 Core Library}" />
-    <file url="file://$PROJECT_DIR$/tcejdb" libraries="{Node.js v0.8.16 Core Library}" />
-  </component>
-</project>
+<project version="4" />
 
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index f372c8c..b2bf410 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,6 +3,7 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/node/nodejs" vcs="Git" />
+    <mapping directory="$USER_HOME$/tmp/tokyocabinet-debian" vcs="Git" />
   </component>
 </project>
 
diff --git a/tcejdb/Makefile.in b/tcejdb/Makefile.in
index 20aed52..eb6463a 100644
--- a/tcejdb/Makefile.in
+++ b/tcejdb/Makefile.in
@@ -13,7 +13,7 @@ SHELL = @SHELL@
 # Package information
 PACKAGE = @PACKAGE_NAME@
 VERSION = @PACKAGE_VERSION@
-PACKAGEDIR = $(PACKAGE)
+PACKAGEDIR = $(PACKAGE)-$(VERSION)
 PACKAGETGZ = $(PACKAGE)-$(VERSION).tar.gz
 LIBVER = @MYLIBVER@
 LIBREV = @MYLIBREV@
@@ -54,8 +54,8 @@ CFLAGS = @MYCFLAGS@
 LDFLAGS = @MYLDFLAGS@
 CMDLDFLAGS = @MYCMDLDFLAGS@
 LIBS = @LIBS@
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
+# LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
+RUNENV = @MYLDLIBPATHENV@=.
 POSTCMD = @MYPOSTCMD@
 
 
diff --git a/tcejdb/debian/control b/tcejdb/debian/control
index eaae021..912b54c 100644
--- a/tcejdb/debian/control
+++ b/tcejdb/debian/control
@@ -6,7 +6,7 @@ Build-Depends: autotools-dev,
                chrpath,
                debhelper (>= 9),
                zlib1g-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://ejdb.org
 Vcs-Browser: https://github.com/Softmotions/ejdb
 Vcs-Git: https://github.com/Softmotions/ejdb.git
diff --git a/tcejdb/debian/source/format b/tcejdb/debian/source/format
index 163aaf8..89ae9db 100644
--- a/tcejdb/debian/source/format
+++ b/tcejdb/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff --git a/tcejdb/myconf.h b/tcejdb/myconf.h
index 8b5ac7f..4db7927 100644
--- a/tcejdb/myconf.h
+++ b/tcejdb/myconf.h
@@ -175,7 +175,7 @@
 #define TCITOHLL(TC_num)  (TC_num)
 #endif
 
-#if defined(_MYNOUBC)
+#if defined(_MYNOUBC) || defined(__hppa__)
 #define TCUBCACHE      0
 #elif defined(_SYS_LINUX_) || defined(_SYS_FREEBSD_) || defined(_SYS_NETBSD_) || \
   defined(_SYS_MACOSX_) || defined(_SYS_SUNOS_)
diff --git a/tcejdb/tcbdb.c b/tcejdb/tcbdb.c
index 371a86d..b056e70 100644
--- a/tcejdb/tcbdb.c
+++ b/tcejdb/tcbdb.c
@@ -2245,6 +2245,26 @@ static bool tcbdbleafaddrec(TCBDB *bdb, BDBLEAF *leaf, int dmode,
           *(int *)vbuf = *(int *)(dbuf + rec->ksiz + psiz);
           break;
         case BDBPDADDDBL:
+#ifdef __mips__
+	  {
+       	  double _vbuf;
+       	  double _tmp;
+
+          if(rec->vsiz != sizeof(double)){
+            tcbdbsetecode(bdb, TCEKEEP, __FILE__, __LINE__, __func__);
+            return false;
+          }
+        memcpy(&_vbuf, vbuf, sizeof(double));
+        if(_vbuf == 0.0){
+          memcpy(vbuf, dbuf + rec->ksiz + psiz, sizeof(double));
+          return true;
+        }
+        memcpy(&_tmp, dbuf + rec->ksiz + psiz, sizeof(double));
+        _tmp += _vbuf;
+        memcpy(dbuf + rec->ksiz + psiz, &_tmp, sizeof(double));
+        memcpy(vbuf, dbuf + rec->ksiz + psiz, sizeof(double));
+       }
+#else
           if(rec->vsiz != sizeof(double)){
             tcbdbsetecode(bdb, TCEKEEP, __FILE__, __LINE__, __func__);
             return false;
@@ -2255,6 +2275,7 @@ static bool tcbdbleafaddrec(TCBDB *bdb, BDBLEAF *leaf, int dmode,
           }
           *(double *)(dbuf + rec->ksiz + psiz) += *(double *)vbuf;
           *(double *)vbuf = *(double *)(dbuf + rec->ksiz + psiz);
+#endif
           break;
         case BDBPDPROC:
           procptr = *(BDBPDPROCOP **)((char *)kbuf - sizeof(procptr));
diff --git a/tcejdb/tcejdb.iml b/tcejdb/tcejdb.iml
index 39d622a..2d96104 100644
--- a/tcejdb/tcejdb.iml
+++ b/tcejdb/tcejdb.iml
@@ -6,6 +6,8 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/nbproject" />
     </content>
+    <content url="file://$USER_HOME$/tmp/mylib-1.0.1" />
+    <content url="file://$USER_HOME$/tmp/tokyocabinet-debian" />
     <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Node.js v0.8.14 Core Library" level="application" />
diff --git a/tcejdb/tcejdb.pc.in b/tcejdb/tcejdb.pc.in
index d3dbcfa..bb74488 100644
--- a/tcejdb/tcejdb.pc.in
+++ b/tcejdb/tcejdb.pc.in
@@ -7,8 +7,9 @@ libexecdir=@libexecdir@
 includedir=@includedir@
 datadir=@datadir@
 
-Name: Tokyo Cabinet EJDB edition
-Description: a modern implementation of DBM
+Name: EJDB
+Description: Embedded JSON database engine
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ltcejdb @LIBS@
+Libs: -L${libdir} -ltcejdb
+Libs.private: @LIBS@
 Cflags: -I${includedir}
diff --git a/tcejdb/tcfdb.c b/tcejdb/tcfdb.c
index 4f70894..7526262 100644
--- a/tcejdb/tcfdb.c
+++ b/tcejdb/tcfdb.c
@@ -1129,10 +1129,12 @@ bool tcfdbmemsync(TCFDB *fdb, bool phys){
   tcfdbdumpmeta(fdb, hbuf);
   memcpy(fdb->map, hbuf, FDBOPAQUEOFF);
   if(phys){
+#ifndef __GNU__
     if(msync(fdb->map, fdb->limsiz, MS_SYNC) == -1){
       tcfdbsetecode(fdb, TCEMMAP, __FILE__, __LINE__, __func__);
       err = true;
     }
+#endif
     if(fsync(fdb->fd) == -1){
       tcfdbsetecode(fdb, TCESYNC, __FILE__, __LINE__, __func__);
       err = true;
diff --git a/tcejdb/tchdb.c b/tcejdb/tchdb.c
index fc4c4eb..525aeb4 100644
--- a/tcejdb/tchdb.c
+++ b/tcejdb/tchdb.c
@@ -1430,10 +1430,12 @@ bool tchdbmemsync(TCHDB *hdb, bool phys){
   memcpy(hdb->map, hbuf, HDBOPAQUEOFF);
   if(phys){
     size_t xmsiz = (hdb->xmsiz > hdb->msiz) ? hdb->xmsiz : hdb->msiz;
+#ifndef __GNU__
     if(msync(hdb->map, xmsiz, MS_SYNC) == -1){
       tchdbsetecode(hdb, TCEMMAP, __FILE__, __LINE__, __func__);
       err = true;
     }
+#endif        
     if(fsync(hdb->fd) == -1){
       tchdbsetecode(hdb, TCESYNC, __FILE__, __LINE__, __func__);
       err = true;