SQLite4
Check-in [bf4758ab15]
Check-in [bf4758ab15]
Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
| Comment: | Fix a memory leak in lsm_unix.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
bf4758ab1549ce4082b66ee6bc1c5d92 |
| User & Date: | dan 2012-09-11 11:47:34 |
|
2012-09-11
| ||
| 17:44 | Add lsm_env.xSleep() method. Fix shared-memory locks so that they work as described in lsm.wiki. check-in: 19f6896763 user: dan tags: trunk | |
| 11:47 | Fix a memory leak in lsm_unix.c. check-in: bf4758ab15 user: dan tags: trunk | |
|
2012-09-10
| ||
| 20:07 | Change locks to use 32-bit shm-sequence-ids instead of 64-bit tree-ids. check-in: acf38e32c8 user: dan tags: trunk | |
Changes to src/lsm_shared.c.
144
145
146
147
148
149
150
151
152
153
154
155
156
157
...
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
|
if( p ){
/* Free the mutexes */
lsmMutexDel(pEnv, p->pClientMutex);
if( p->pFile ){
lsmEnvClose(pEnv, p->pFile);
}
/* Free the memory allocated for the Database struct itself */
lsmFree(pEnv, p);
}
}
static void doDbDisconnect(lsm_db *pDb){
................................................................................
LsmFile *pNext;
for(pIter=p->pLsmFile; pIter; pIter=pNext){
pNext = pIter->pNext;
lsmEnvClose(pDb->pEnv, pIter->pFile);
lsmFree(pDb->pEnv, pIter);
}
}
lsmFree(pDb->pEnv, p->apShmChunk);
freeDatabase(pDb->pEnv, p);
}
leaveGlobalMutex(pDb->pEnv);
}
}
Level *lsmDbSnapshotLevel(Snapshot *pSnapshot){
|
>
>
>
<
|
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
...
394
395
396
397
398
399
400
401
402
403
404
405
406
407
|
if( p ){
/* Free the mutexes */
lsmMutexDel(pEnv, p->pClientMutex);
if( p->pFile ){
lsmEnvClose(pEnv, p->pFile);
}
/* Free the array of shm pointers */
lsmFree(pEnv, p->apShmChunk);
/* Free the memory allocated for the Database struct itself */
lsmFree(pEnv, p);
}
}
static void doDbDisconnect(lsm_db *pDb){
................................................................................
LsmFile *pNext;
for(pIter=p->pLsmFile; pIter; pIter=pNext){
pNext = pIter->pNext;
lsmEnvClose(pDb->pEnv, pIter->pFile);
lsmFree(pDb->pEnv, pIter);
}
}
freeDatabase(pDb->pEnv, p);
}
leaveGlobalMutex(pDb->pEnv);
}
}
Level *lsmDbSnapshotLevel(Snapshot *pSnapshot){
|
Changes to src/lsm_unix.c.
383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 |
}
}
close(p->shmfd);
p->shmfd = 0;
if( bDelete ){
char *zShm = posixShmFile(p);
if( zShm ) unlink(zShm);
}
}
return LSM_OK;
}
static int lsmPosixOsClose(lsm_file *pFile){
PosixFile *p = (PosixFile *)pFile;
lsmPosixOsShmUnmap(pFile, 0);
if( p->pMap ) munmap(p->pMap, p->nMap);
close(p->fd);
lsm_free(p->pEnv, p);
return LSM_OK;
}
/****************************************************************************
** Memory allocation routines.
*/
|
> > |
383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 |
}
}
close(p->shmfd);
p->shmfd = 0;
if( bDelete ){
char *zShm = posixShmFile(p);
if( zShm ) unlink(zShm);
lsmFree(p->pEnv, zShm);
}
}
return LSM_OK;
}
static int lsmPosixOsClose(lsm_file *pFile){
PosixFile *p = (PosixFile *)pFile;
lsmPosixOsShmUnmap(pFile, 0);
if( p->pMap ) munmap(p->pMap, p->nMap);
close(p->fd);
lsm_free(p->pEnv, p->apShm);
lsm_free(p->pEnv, p);
return LSM_OK;
}
/****************************************************************************
** Memory allocation routines.
*/
|