Deleted Added
sdiff udiff text old ( 8870 ) new ( 14287 )
full compact
bt_close.c (8870) bt_close.c (14287)
1/*-
1/*-
2 * Copyright (c) 1990, 1993
2 * Copyright (c) 1990, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Mike Olson.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:

--- 19 unchanged lines hidden (view full) ---

30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Mike Olson.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:

--- 19 unchanged lines hidden (view full) ---

30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
38static char sccsid[] = "@(#)bt_close.c 8.3 (Berkeley) 2/21/94";
38static char sccsid[] = "@(#)bt_close.c 8.7 (Berkeley) 8/17/94";
39#endif /* LIBC_SCCS and not lint */
40
41#include <sys/param.h>
42
43#include <errno.h>
44#include <stdio.h>
45#include <stdlib.h>
46#include <string.h>

--- 23 unchanged lines hidden (view full) ---

70 t = dbp->internal;
71
72 /* Toss any page pinned across calls. */
73 if (t->bt_pinned != NULL) {
74 mpool_put(t->bt_mp, t->bt_pinned, 0);
75 t->bt_pinned = NULL;
76 }
77
39#endif /* LIBC_SCCS and not lint */
40
41#include <sys/param.h>
42
43#include <errno.h>
44#include <stdio.h>
45#include <stdlib.h>
46#include <string.h>

--- 23 unchanged lines hidden (view full) ---

70 t = dbp->internal;
71
72 /* Toss any page pinned across calls. */
73 if (t->bt_pinned != NULL) {
74 mpool_put(t->bt_mp, t->bt_pinned, 0);
75 t->bt_pinned = NULL;
76 }
77
78 /*
79 * Delete any already deleted record that we've been saving
80 * because the cursor pointed to it.
81 */
82 if (ISSET(t, B_DELCRSR) && __bt_crsrdel(t, &t->bt_bcursor))
83 return (RET_ERROR);
84
78 /* Sync the tree. */
85 if (__bt_sync(dbp, 0) == RET_ERROR)
86 return (RET_ERROR);
87
79 if (__bt_sync(dbp, 0) == RET_ERROR)
80 return (RET_ERROR);
81
82 /* Close the memory pool. */
88 if (mpool_close(t->bt_mp) == RET_ERROR)
89 return (RET_ERROR);
90
83 if (mpool_close(t->bt_mp) == RET_ERROR)
84 return (RET_ERROR);
85
91 if (t->bt_stack)
92 free(t->bt_stack);
93 if (t->bt_kbuf)
94 free(t->bt_kbuf);
95 if (t->bt_dbuf)
96 free(t->bt_dbuf);
86 /* Free random memory. */
87 if (t->bt_cursor.key.data != NULL) {
88 free(t->bt_cursor.key.data);
89 t->bt_cursor.key.size = 0;
90 t->bt_cursor.key.data = NULL;
91 }
92 if (t->bt_rkey.data) {
93 free(t->bt_rkey.data);
94 t->bt_rkey.size = 0;
95 t->bt_rkey.data = NULL;
96 }
97 if (t->bt_rdata.data) {
98 free(t->bt_rdata.data);
99 t->bt_rdata.size = 0;
100 t->bt_rdata.data = NULL;
101 }
97
98 fd = t->bt_fd;
99 free(t);
100 free(dbp);
101 return (close(fd) ? RET_ERROR : RET_SUCCESS);
102}
103
104/*

--- 7 unchanged lines hidden (view full) ---

112 */
113int
114__bt_sync(dbp, flags)
115 const DB *dbp;
116 u_int flags;
117{
118 BTREE *t;
119 int status;
102
103 fd = t->bt_fd;
104 free(t);
105 free(dbp);
106 return (close(fd) ? RET_ERROR : RET_SUCCESS);
107}
108
109/*

--- 7 unchanged lines hidden (view full) ---

117 */
118int
119__bt_sync(dbp, flags)
120 const DB *dbp;
121 u_int flags;
122{
123 BTREE *t;
124 int status;
120 PAGE *h;
121 void *p;
122
123 t = dbp->internal;
124
125 /* Toss any page pinned across calls. */
126 if (t->bt_pinned != NULL) {
127 mpool_put(t->bt_mp, t->bt_pinned, 0);
128 t->bt_pinned = NULL;
129 }
130
131 /* Sync doesn't currently take any flags. */
132 if (flags != 0) {
133 errno = EINVAL;
134 return (RET_ERROR);
135 }
136
125
126 t = dbp->internal;
127
128 /* Toss any page pinned across calls. */
129 if (t->bt_pinned != NULL) {
130 mpool_put(t->bt_mp, t->bt_pinned, 0);
131 t->bt_pinned = NULL;
132 }
133
134 /* Sync doesn't currently take any flags. */
135 if (flags != 0) {
136 errno = EINVAL;
137 return (RET_ERROR);
138 }
139
137 if (ISSET(t, B_INMEM | B_RDONLY) || !ISSET(t, B_MODIFIED))
140 if (F_ISSET(t, B_INMEM | B_RDONLY) || !F_ISSET(t, B_MODIFIED))
138 return (RET_SUCCESS);
139
141 return (RET_SUCCESS);
142
140 if (ISSET(t, B_METADIRTY) && bt_meta(t) == RET_ERROR)
143 if (F_ISSET(t, B_METADIRTY) && bt_meta(t) == RET_ERROR)
141 return (RET_ERROR);
142
144 return (RET_ERROR);
145
143 /*
144 * Nastiness. If the cursor has been marked for deletion, but not
145 * actually deleted, we have to make a copy of the page, delete the
146 * key/data item, sync the file, and then restore the original page
147 * contents.
148 */
149 if (ISSET(t, B_DELCRSR)) {
150 if ((p = (void *)malloc(t->bt_psize)) == NULL)
151 return (RET_ERROR);
152 if ((h = mpool_get(t->bt_mp, t->bt_bcursor.pgno, 0)) == NULL)
153 return (RET_ERROR);
154 memmove(p, h, t->bt_psize);
155 if ((status =
156 __bt_dleaf(t, h, t->bt_bcursor.index)) == RET_ERROR)
157 goto ecrsr;
158 mpool_put(t->bt_mp, h, MPOOL_DIRTY);
159 }
160
161 if ((status = mpool_sync(t->bt_mp)) == RET_SUCCESS)
146 if ((status = mpool_sync(t->bt_mp)) == RET_SUCCESS)
162 CLR(t, B_MODIFIED);
147 F_CLR(t, B_MODIFIED);
163
148
164ecrsr: if (ISSET(t, B_DELCRSR)) {
165 if ((h = mpool_get(t->bt_mp, t->bt_bcursor.pgno, 0)) == NULL)
166 return (RET_ERROR);
167 memmove(h, p, t->bt_psize);
168 free(p);
169 mpool_put(t->bt_mp, h, MPOOL_DIRTY);
170 }
171 return (status);
172}
173
174/*
175 * BT_META -- write the tree meta data to disk.
176 *
177 * Parameters:
178 * t: tree

--- 7 unchanged lines hidden (view full) ---

186{
187 BTMETA m;
188 void *p;
189
190 if ((p = mpool_get(t->bt_mp, P_META, 0)) == NULL)
191 return (RET_ERROR);
192
193 /* Fill in metadata. */
149 return (status);
150}
151
152/*
153 * BT_META -- write the tree meta data to disk.
154 *
155 * Parameters:
156 * t: tree

--- 7 unchanged lines hidden (view full) ---

164{
165 BTMETA m;
166 void *p;
167
168 if ((p = mpool_get(t->bt_mp, P_META, 0)) == NULL)
169 return (RET_ERROR);
170
171 /* Fill in metadata. */
194 m.m_magic = BTREEMAGIC;
195 m.m_version = BTREEVERSION;
196 m.m_psize = t->bt_psize;
197 m.m_free = t->bt_free;
198 m.m_nrecs = t->bt_nrecs;
199 m.m_flags = t->bt_flags & SAVEMETA;
172 m.magic = BTREEMAGIC;
173 m.version = BTREEVERSION;
174 m.psize = t->bt_psize;
175 m.free = t->bt_free;
176 m.nrecs = t->bt_nrecs;
177 m.flags = F_ISSET(t, SAVEMETA);
200
201 memmove(p, &m, sizeof(BTMETA));
202 mpool_put(t->bt_mp, p, MPOOL_DIRTY);
203 return (RET_SUCCESS);
204}
178
179 memmove(p, &m, sizeof(BTMETA));
180 mpool_put(t->bt_mp, p, MPOOL_DIRTY);
181 return (RET_SUCCESS);
182}