firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 06:03:02 +01:00
Code Issues

Reverted allocations in the sort module back to system instead of the default pool. Look at Dave's comments in sort_alloc.

Browse Source
This commit is contained in:
dimitr 2003-01-18 15:03:45 +00:00
parent b32f2c8252
commit 15e44973c8
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/jrd/sort.cpp
View File

@ -19,7 +19,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
* $Id: sort.cpp,v 1.22 2003-01-16 17:47:04 skidder Exp $ * $Id: sort.cpp,v 1.23 2003-01-18 15:03:45 dimitr Exp $
* *
* 2001-09-24 SJL - Temporary fix for large sort file bug * 2001-09-24 SJL - Temporary fix for large sort file bug
* *
@ -574,7 +574,7 @@ void SORT_fini(SCB scb, ATT att)
/* -- Morgan Schweers (mrs) */ /* -- Morgan Schweers (mrs) */
if (rval == TRUE) if (rval == TRUE)
gds__free(scb); MemoryPool::external_free(scb);
} }
@ -810,7 +810,7 @@ SCB SORT_init(STATUS * status_vector,
*status_vector++ = gds_sort_mem_err; *status_vector++ = gds_sort_mem_err;
/* Msg356: sort error: not enough memory */ /* Msg356: sort error: not enough memory */
*status_vector = gds_arg_end; *status_vector = gds_arg_end;
gds__free(scb); MemoryPool::external_free(scb);
return NULL; return NULL;
} }
@ -1072,7 +1072,7 @@ int SORT_sort(STATUS * status_vector, SCB scb)
for (run_count = 0, run = scb->scb_runs; run; run = run->run_next) { for (run_count = 0, run = scb->scb_runs; run; run = run->run_next) {
if (run->run_buff_alloc) { if (run->run_buff_alloc) {
gds__free(run->run_buffer); MemoryPool::external_free(run->run_buffer);
run->run_buff_alloc = 0; run->run_buff_alloc = 0;
} }
++run_count; ++run_count;
@ -1109,7 +1109,7 @@ int SORT_sort(STATUS * status_vector, SCB scb)
merge_pool = scb->scb_merge_pool; merge_pool = scb->scb_merge_pool;
} catch(...) { } catch(...) {
gds__free(streams); MemoryPool::external_free(streams);
*status_vector++ = gds_arg_gds; *status_vector++ = gds_arg_gds;
*status_vector++ = gds_sort_mem_err; *status_vector++ = gds_sort_mem_err;
*status_vector = gds_arg_end; *status_vector = gds_arg_end;
@ -1164,7 +1164,7 @@ int SORT_sort(STATUS * status_vector, SCB scb)
} }
if (streams != streams_local) if (streams != streams_local)
gds__free(streams); MemoryPool::external_free(streams);
buffer = (SORTP *) scb->scb_first_pointer; buffer = (SORTP *) scb->scb_first_pointer;
merge->mrg_header.rmh_parent = NULL; merge->mrg_header.rmh_parent = NULL;
scb->scb_merge = merge; scb->scb_merge = merge;
@ -1322,7 +1322,7 @@ static UCHAR *sort_alloc(SCB scb, ULONG size)
try { try {
block = block =
reinterpret_cast<UCHAR*>(gds__alloc((SLONG) size)); reinterpret_cast<UCHAR*>(MemoryPool::external_alloc(size));
/* FREE: caller responsible for freeing */ /* FREE: caller responsible for freeing */
} catch(...) { } catch(...) {
if (!block) if (!block)
@ -2251,39 +2251,35 @@ static BOOLEAN local_fini(SCB scb, ATT att)
if (sfb->sfb_file_name) { if (sfb->sfb_file_name) {
unlink(sfb->sfb_file_name); unlink(sfb->sfb_file_name);
gds__free(sfb->sfb_file_name); MemoryPool::external_free(sfb->sfb_file_name);
sfb->sfb_file_name = NULL; sfb->sfb_file_name = NULL;
} }
while ( (space = sfb->sfb_free_wfs) ) { while ( (space = sfb->sfb_free_wfs) ) {
sfb->sfb_free_wfs = space->wfs_next; sfb->sfb_free_wfs = space->wfs_next;
gds__free(space); MemoryPool::external_free(space);
} }
while ( (space = sfb->sfb_file_space) ) { while ( (space = sfb->sfb_file_space) ) {
sfb->sfb_file_space = space->wfs_next; sfb->sfb_file_space = space->wfs_next;
gds__free(space); MemoryPool::external_free(space);
} }
gds__free(sfb); MemoryPool::external_free(sfb);
} }
/* get rid of extra merge space */ /* get rid of extra merge space */
while ( (merge_buf = (ULONG **) scb->scb_merge_space) ) { while ( (merge_buf = (ULONG **) scb->scb_merge_space) ) {
scb->scb_merge_space = *merge_buf; scb->scb_merge_space = *merge_buf;
gds__free(merge_buf); MemoryPool::external_free(merge_buf);
} }
/* If runs are allocated and not in the big block, release them. Then release /* If runs are allocated and not in the big block, release them. Then release
the big block. */ the big block. */
if (scb->scb_memory) { if (scb->scb_memory) {
#ifdef DEBUG_MERGE MemoryPool::external_free(scb->scb_memory);
gds__free(scb->scb_memory);
#else
gds__free(scb->scb_memory);
#endif
scb->scb_memory = NULL; scb->scb_memory = NULL;
} }
@ -2291,20 +2287,20 @@ static BOOLEAN local_fini(SCB scb, ATT att)
while ( (run = scb->scb_runs) ) { while ( (run = scb->scb_runs) ) {
scb->scb_runs = run->run_next; scb->scb_runs = run->run_next;
if (run->run_buff_alloc) if (run->run_buff_alloc)
gds__free(run->run_buffer); MemoryPool::external_free(run->run_buffer);
gds__free(run); MemoryPool::external_free(run);
} }
/* Clean up the free runs also */ /* Clean up the free runs also */
while ( (run = scb->scb_free_runs) ) { while ( (run = scb->scb_free_runs) ) {
scb->scb_free_runs = run->run_next; scb->scb_free_runs = run->run_next;
if (run->run_buff_alloc) if (run->run_buff_alloc)
gds__free(run->run_buffer); MemoryPool::external_free(run->run_buffer);
gds__free(run); MemoryPool::external_free(run);
} }
if (scb->scb_merge_pool) { if (scb->scb_merge_pool) {
gds__free(scb->scb_merge_pool); MemoryPool::external_free(scb->scb_merge_pool);
scb->scb_merge_pool = NULL; scb->scb_merge_pool = NULL;
} }
@ -2494,7 +2490,7 @@ static void merge_runs(SCB scb, USHORT n)
scb->scb_free_runs = run->run_next; scb->scb_free_runs = run->run_next;
if (run->run_buff_alloc) { if (run->run_buff_alloc) {
gds__free(run->run_buffer); MemoryPool::external_free(run->run_buffer);
run->run_buff_alloc = 0; run->run_buff_alloc = 0;
} }
temp_run.run_header.rmh_type = TYPE_RUN; temp_run.run_header.rmh_type = TYPE_RUN;
@ -2796,7 +2792,7 @@ static ULONG order(SCB scb)
if (buffer != temp) if (buffer != temp)
#endif #endif
if (buffer != NULL) if (buffer != NULL)
gds__free(buffer); MemoryPool::external_free(buffer);
return (((SORTP *) output) - return (((SORTP *) output) -
((SORTP *) scb->scb_last_record)) / (scb->scb_longs - ((SORTP *) scb->scb_last_record)) / (scb->scb_longs -