From d977ff635a8b16268986e79488ac1a9dcea266c6 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 6 Jul 2014 20:00:30 +0000 Subject: [PATCH] db47: moved to github SVN-Revision: 41535 --- libs/db47/Makefile | 100 ---------- libs/db47/patches/001-sequence_lock.patch | 56 ------ libs/db47/patches/002-lock.patch | 43 ----- libs/db47/patches/003-dead_lock.patch | 212 ---------------------- 4 files changed, 411 deletions(-) delete mode 100644 libs/db47/Makefile delete mode 100644 libs/db47/patches/001-sequence_lock.patch delete mode 100644 libs/db47/patches/002-lock.patch delete mode 100644 libs/db47/patches/003-dead_lock.patch diff --git a/libs/db47/Makefile b/libs/db47/Makefile deleted file mode 100644 index 0265eb0f5..000000000 --- a/libs/db47/Makefile +++ /dev/null @@ -1,100 +0,0 @@ -# -# Copyright (C) 2009-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/uclibc++.mk - -PKG_NAME:=db47 -PKG_VERSION:=4.7.25.NC -PKG_RELEASE:=6 - -PKG_BUILD_DIR:=$(BUILD_DIR)/db-$(PKG_VERSION) -PKG_SOURCE:=db-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://download.oracle.com/berkeley-db/ -PKG_MD5SUM:=073ab7f20d24b3872a51ca762f5090e7 - -PKG_LICENSE:=BSD-2c -PKG_LICENSE_FILES:=LICENSE - -PKG_FIXUP:=autoreconf -PKG_LIBTOOL_PATHS:=. build_unix -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libdb47 - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libxml2 - TITLE:=Berkeley DB library (4.7) - URL:=http://www.sleepycat.com/products/db.shtml - MAINTAINER:=W. Michael Petullo -endef - -define Package/libdb47/description - Berkeley DB library (4.7). -endef - -define Package/libdb47xx - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libdb47 $(CXX_DEPENDS) - TITLE:=Berkeley DB library (4.7) for C++ - URL:=http://www.sleepycat.com/products/db.shtml - MAINTAINER:=W. Michael Petullo -endef - -define Package/libdb47xx/description - Berkeley DB library (4.7). C++ wrapper. -endef - -CONFIGURE_PATH = build_unix -CONFIGURE_CMD = ../dist/configure - -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --disable-java \ - --with-mutex=UNIX/fcntl \ - --disable-tcl \ - --disable-rpc \ - --enable-compat185 \ - --enable-smallbuild \ - --disable-debug \ - --enable-cryptography \ - $(if $(CONFIG_PACKAGE_libdb47xx),--enable-cxx,--disable-cxx) - -TARGET_CFLAGS += $(FPIC) - -define Build/Compile - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/build_unix \ - DESTDIR="$(PKG_INSTALL_DIR)" all - $(MAKE) -C $(PKG_BUILD_DIR)/build_unix \ - DESTDIR="$(PKG_INSTALL_DIR)" install -endef - -define Package/libdb47/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb-*.so $(1)/usr/lib/ -endef - -define Package/libdb47xx/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb_cxx-*.so $(1)/usr/lib/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/db.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/db_cxx.h $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(1)/usr/lib -endef - -$(eval $(call BuildPackage,libdb47)) -$(eval $(call BuildPackage,libdb47xx)) - diff --git a/libs/db47/patches/001-sequence_lock.patch b/libs/db47/patches/001-sequence_lock.patch deleted file mode 100644 index 8ede4b4b0..000000000 --- a/libs/db47/patches/001-sequence_lock.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ruN db-4.7.25.NC/sequence/sequence.c db-4.7.25.NC.new/sequence/sequence.c ---- db-4.7.25.NC/sequence/sequence.c 2008-05-05 22:25:09.000000000 +0200 -+++ db-4.7.25.NC.new/sequence/sequence.c 2009-11-08 12:50:27.000000000 +0100 -@@ -187,7 +187,11 @@ - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -- if (DB_IS_READONLY(dbp)) { -+ /* -+ * We can let replication clients open sequences, but must -+ * check later that they do not update them. -+ */ -+ if (F_ISSET(dbp, DB_AM_RDONLY)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } -@@ -244,6 +248,11 @@ - if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || - !LF_ISSET(DB_CREATE)) - goto err; -+ if (IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->open"); -+ goto err; -+ } - ret = 0; - - rp = &seq->seq_record; -@@ -296,7 +305,12 @@ - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { --oldver: rp->seq_version = DB_SEQUENCE_VERSION; -+oldver: if (IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->open"); -+ goto err; -+ } -+ rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = -@@ -707,6 +721,13 @@ - - MUTEX_LOCK(env, seq->mtx_seq); - -+ if (handle_check && IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->get"); -+ goto err; -+ } -+ -+ - if (rp->seq_min + delta > rp->seq_max) { - __db_errx(env, "Sequence overflow"); - ret = EINVAL; diff --git a/libs/db47/patches/002-lock.patch b/libs/db47/patches/002-lock.patch deleted file mode 100644 index 8cfd8faa9..000000000 --- a/libs/db47/patches/002-lock.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -urN db-4.7.25.NC/lock/lock.c db-4.7.25.NC.new/lock/lock.c ---- db-4.7.25.NC/lock/lock.c 2008-05-07 14:27:35.000000000 +0200 -+++ db-4.7.25.NC.new/lock/lock.c 2009-11-08 12:52:19.000000000 +0100 -@@ -1274,10 +1274,12 @@ - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -- LOCK_REGION_LOCK(env); -+ if (region->part_t_size != 1) -+ LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -- LOCK_REGION_UNLOCK(env); -+ if (region->part_t_size != 1) -+ LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); -@@ -1467,15 +1469,21 @@ - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -- LOCK_REGION_LOCK(env); -+ /* -+ * If we have only one partition, the region is locked. -+ */ -+ if (region->part_t_size != 1) -+ LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -- LOCK_REGION_UNLOCK(env); -+ if (region->part_t_size != 1) -+ LOCK_REGION_UNLOCK(env); - goto err; - } -- LOCK_REGION_UNLOCK(env); -+ if (region->part_t_size != 1) -+ LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); diff --git a/libs/db47/patches/003-dead_lock.patch b/libs/db47/patches/003-dead_lock.patch deleted file mode 100644 index 2b866601d..000000000 --- a/libs/db47/patches/003-dead_lock.patch +++ /dev/null @@ -1,212 +0,0 @@ -diff -urN db-4.7.25.NC/lock/lock_deadlock.c db-4.7.25.NC.new/lock/lock_deadlock.c ---- db-4.7.25.NC/lock/lock_deadlock.c 2008-03-10 14:31:33.000000000 +0100 -+++ db-4.7.25.NC.new/lock/lock_deadlock.c 2009-11-08 12:53:25.000000000 +0100 -@@ -121,7 +121,7 @@ - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -- u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap; -+ u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; -@@ -133,7 +133,8 @@ - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -- free_me = NULL; -+ copymap = tmpmap = NULL; -+ deadlist = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) -@@ -179,11 +180,11 @@ - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -- goto err1; -+ goto err; - - /* Find a deadlock. */ - if ((ret = -- __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0) -+ __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0) - return (ret); - - /* -@@ -204,8 +205,7 @@ - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -- free_me = deadp; -- for (; *deadp != NULL; deadp++) { -+ for (deadp = deadlist; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; -@@ -342,11 +342,12 @@ - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -- __os_free(env, tmpmap); --err1: __os_free(env, copymap); -- --err: if (free_me != NULL) -- __os_free(env, free_me); -+err: if(copymap != NULL) -+ __os_free(env, copymap); -+ if (deadlist != NULL) -+ __os_free(env, deadlist); -+ if(tmpmap != NULL) -+ __os_free(env, tmpmap); - __os_free(env, bitmap); - __os_free(env, idmap); - -@@ -360,6 +361,17 @@ - - #define DD_INVALID_ID ((u_int32_t) -1) - -+/* -+ * __dd_build -- -+ * Build the lock dependency bit maps. -+ * Notes on syncronization: -+ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have -+ * a single partition. -+ * LOCK_LOCKERS is held while we are walking the lockers list and -+ * to single thread the use of lockerp->dd_id. -+ * LOCK_DD protects the DD list of objects. -+ */ -+ - static int - __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp) - ENV *env; -@@ -393,6 +405,7 @@ - * In particular we do not build the conflict array and our caller - * needs to expect this. - */ -+ LOCK_SYSTEM_LOCK(lt, region); - if (atype == DB_LOCK_EXPIRE) { - skip: LOCK_DD(env, region); - op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj); -@@ -430,17 +443,18 @@ - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - goto done; - } - - /* -- * We'll check how many lockers there are, add a few more in for -- * good measure and then allocate all the structures. Then we'll -- * verify that we have enough room when we go back in and get the -- * mutex the second time. -+ * Allocate after locking the region -+ * to make sure the structures are large enough. - */ --retry: count = region->stat.st_nlockers; -+ LOCK_LOCKERS(env, region); -+ count = region->stat.st_nlockers; - if (count == 0) { -+ UNLOCK_LOCKERS(env, region); - *nlockers = 0; - return (0); - } -@@ -448,50 +462,37 @@ - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - -- count += 20; - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -- /* -- * Allocate enough space for a count by count bitmap matrix. -- * -- * XXX -- * We can probably save the malloc's between iterations just -- * reallocing if necessary because count grew by too much. -- */ -+ /* Allocate enough space for a count by count bitmap matrix. */ - if ((ret = __os_calloc(env, (size_t)count, -- sizeof(u_int32_t) * nentries, &bitmap)) != 0) -+ sizeof(u_int32_t) * nentries, &bitmap)) != 0) { -+ UNLOCK_LOCKERS(env, region); - return (ret); -+ } - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* -- * Now go back in and actually fill in the matrix. -- */ -- if (region->stat.st_nlockers > count) { -- __os_free(env, bitmap); -- __os_free(env, tmpmap); -- __os_free(env, id_array); -- goto retry; -- } -- -- /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; -- LOCK_LOCKERS(env, region); - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { -+ DB_ASSERT(env, id < count); - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { -@@ -510,7 +511,6 @@ - lip->dd_id = DD_INVALID_ID; - - } -- UNLOCK_LOCKERS(env, region); - - /* - * We only need consider objects that have waiters, so we use -@@ -669,7 +669,6 @@ - * status after building the bit maps so that we will not detect - * a blocked transaction without noting that it is already aborting. - */ -- LOCK_LOCKERS(env, region); - for (id = 0; id < count; id++) { - if (!id_array[id].valid) - continue; -@@ -738,6 +737,7 @@ - id_array[id].in_abort = 1; - } - UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - - /* - * Now we can release everything except the bitmap matrix that we -@@ -839,6 +839,7 @@ - ret = 0; - - /* We must lock so this locker cannot go away while we abort it. */ -+ LOCK_SYSTEM_LOCK(lt, region); - LOCK_LOCKERS(env, region); - - /* -@@ -895,6 +896,7 @@ - done: OBJECT_UNLOCK(lt, region, info->last_ndx); - err: - out: UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - return (ret); - } - -- 2.30.2