NextGraph
/
lmdb
mirror of https://github.com/nextgraph-org/lmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename idl to midl

Browse Source
vmware
Howard Chu 13 years ago
parent f5297dfc25
commit 985f765dc5
4 changed files with 20 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      libraries/libmdb/Makefile
  2. 10
      libraries/libmdb/mdb.c
  3. 8
      libraries/libmdb/midl.c
  4. 8
      libraries/libmdb/midl.h

14
libraries/libmdb/Makefile
Unescape View File

@ -14,22 +14,22 @@ test: all
mkdir testdb mkdir testdb
./mtest && ./mdb_stat testdb ./mtest && ./mdb_stat testdb
libmdb.a: mdb.o idl.o libmdb.a: mdb.o midl.o
ar rs $@ mdb.o idl.o ar rs $@ mdb.o midl.o
libmdb.so: mdb.o idl.o libmdb.so: mdb.o midl.o
gcc -shared -o $@ mdb.o idl.o gcc -shared -o $@ mdb.o midl.o
mdb_stat: mdb_stat.o libmdb.a mdb_stat: mdb_stat.o libmdb.a
mtest: mtest.o libmdb.a mtest: mtest.o libmdb.a
mtest2: mtest2.o libmdb.a mtest2: mtest2.o libmdb.a
mtest3: mtest3.o libmdb.a mtest3: mtest3.o libmdb.a
mdb.o: mdb.c mdb.h idl.h mdb.o: mdb.c mdb.h midl.h
$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c
idl.o: idl.c idl.h midl.o: midl.c midl.h
$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c idl.c $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c
%: %.o %: %.o
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@

10
libraries/libmdb/mdb.c
Unescape View File

@ -54,7 +54,7 @@
#define ULONG unsigned long #define ULONG unsigned long
typedef ULONG pgno_t; typedef ULONG pgno_t;
#include "idl.h" #include "midl.h"
#ifndef DEBUG #ifndef DEBUG
#define DEBUG 1 #define DEBUG 1
@ -580,7 +580,7 @@ mdb_touch(MDB_txn *txn, MDB_pageparent *pp)
if ((dp = mdb_alloc_page(txn, pp->mp_parent, pp->mp_pi, 1)) == NULL) if ((dp = mdb_alloc_page(txn, pp->mp_parent, pp->mp_pi, 1)) == NULL)
return ENOMEM; return ENOMEM;
DPRINTF("touched page %lu -> %lu", mp->mp_pgno, dp->p.mp_pgno); DPRINTF("touched page %lu -> %lu", mp->mp_pgno, dp->p.mp_pgno);
mdb_idl_insert(txn->mt_free_pgs, mp->mp_pgno); mdb_midl_insert(txn->mt_free_pgs, mp->mp_pgno);
pgno = dp->p.mp_pgno; pgno = dp->p.mp_pgno;
memcpy(&dp->p, mp, txn->mt_env->me_psize); memcpy(&dp->p, mp, txn->mt_env->me_psize);
mp = &dp->p; mp = &dp->p;
@ -2682,7 +2682,7 @@ mdb_del0(MDB_txn *txn, MDB_dbi dbi, unsigned int ki, MDB_pageparent *mpp, MDB_no
ovpages = OVPAGES(NODEDSZ(leaf), txn->mt_env->me_psize); ovpages = OVPAGES(NODEDSZ(leaf), txn->mt_env->me_psize);
for (i=0; i<ovpages; i++) { for (i=0; i<ovpages; i++) {
DPRINTF("freed ov page %lu", pg); DPRINTF("freed ov page %lu", pg);
mdb_idl_insert(txn->mt_free_pgs, pg); mdb_midl_insert(txn->mt_free_pgs, pg);
pg++; pg++;
} }
} }
@ -2764,7 +2764,7 @@ mdb_del(MDB_txn *txn, MDB_dbi dbi,
while (parent != NULL) { while (parent != NULL) {
for (i=0; i<NUMKEYS(top->mp_page); i++) { for (i=0; i<NUMKEYS(top->mp_page); i++) {
ni = NODEPTR(top->mp_page, i); ni = NODEPTR(top->mp_page, i);
mdb_idl_insert(txn->mt_free_pgs, ni->mn_pgno); mdb_midl_insert(txn->mt_free_pgs, ni->mn_pgno);
} }
if (parent) { if (parent) {
parent->mp_ki++; parent->mp_ki++;
@ -2779,7 +2779,7 @@ mdb_del(MDB_txn *txn, MDB_dbi dbi,
} }
} }
} }
mdb_idl_insert(txn->mt_free_pgs, mx.mx_txn.mt_dbs[mx.mx_cursor.mc_dbi].md_root); mdb_midl_insert(txn->mt_free_pgs, mx.mx_txn.mt_dbs[mx.mx_cursor.mc_dbi].md_root);
} }
} }
} }

8
libraries/libmdb/idl.c → libraries/libmdb/midl.c
Unescape View File

@ -17,14 +17,14 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <assert.h> #include <assert.h>
#include "idl.h" #include "midl.h"
typedef unsigned long pgno_t; typedef unsigned long pgno_t;
/* Sort the IDLs from highest to lowest */ /* Sort the IDLs from highest to lowest */
#define IDL_CMP(x,y) ( x > y ? -1 : ( x < y ? 1 : 0 ) ) #define IDL_CMP(x,y) ( x > y ? -1 : ( x < y ? 1 : 0 ) )
unsigned mdb_idl_search( ID *ids, ID id ) unsigned mdb_midl_search( ID *ids, ID id )
{ {
/* /*
* binary search of id in ids * binary search of id in ids
@ -60,7 +60,7 @@ unsigned mdb_idl_search( ID *ids, ID id )
} }
} }
int mdb_idl_insert( ID *ids, ID id ) int mdb_midl_insert( ID *ids, ID id )
{ {
unsigned x; unsigned x;
@ -75,7 +75,7 @@ int mdb_idl_insert( ID *ids, ID id )
return 0; return 0;
} }
x = mdb_idl_search( ids, id ); x = mdb_midl_search( ids, id );
assert( x > 0 ); assert( x > 0 );
if( x < 1 ) { if( x < 1 ) {

8
libraries/libmdb/idl.h → libraries/libmdb/midl.h
Unescape View File

@ -14,8 +14,8 @@
* <http://www.OpenLDAP.org/license.html>. * <http://www.OpenLDAP.org/license.html>.
*/ */
#ifndef _MDB_IDL_H_ #ifndef _MDB_MIDL_H_
#define _MDB_IDL_H_ #define _MDB_MIDL_H_
#define AC_MEMCPY(dst,src,size) memcpy(dst,src,size) #define AC_MEMCPY(dst,src,size) memcpy(dst,src,size)
@ -73,6 +73,6 @@
#define MDB_IDL_N( ids ) ( MDB_IDL_IS_RANGE(ids) \ #define MDB_IDL_N( ids ) ( MDB_IDL_IS_RANGE(ids) \
? (ids[2]-ids[1])+1 : ids[0] ) ? (ids[2]-ids[1])+1 : ids[0] )
int mdb_idl_insert( ID *ids, ID id ); int mdb_midl_insert( ID *ids, ID id );
#endif #endif /* _MDB_MIDL_H_ */
Write Preview
Loading…
Cancel
Save