nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0.2.1 onto the development branch.

Browse Source 
Manually resolved conflicts on version number; all else applied cleanly.
This commit is contained in:
Nick Mathewson 2009-05-12 13:57:58 -04:00
commit 5fc08d1920
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18,6 +18,9 @@ Changes in version 0.2.1.15??? - ????-??-??
- Actually return -1 in the error case for read_bandwidth_usage. Bug
was harmless, we currently don't care for the return value anywhere.
Bugfix on 0.2.0.9-alpha.
- Provide a more useful log message if bug 977 (related to buffer
freelists) ever reappears, and do not crash right away.
Changes in version 0.2.1.14-rc - 2009-04-12
o Major features:

13
src/or/buffers.c
View File

@ -258,6 +258,7 @@ buf_shrink_freelists(int free_all)
int n_to_free = free_all ? freelists[i].cur_length :
(freelists[i].lowest_length - slack);
int n_to_skip = freelists[i].cur_length - n_to_free;
int orig_n_to_free = n_to_free, n_freed=0;
int new_length = n_to_skip;
chunk_t **chp = &freelists[i].head;
chunk_t *chunk;
@ -276,9 +277,19 @@ buf_shrink_freelists(int free_all)
tor_free(chunk);
chunk = next;
--n_to_free;
++n_freed;
++freelists[i].n_free;
}
tor_assert(!n_to_free);
if (n_to_free) {
log_warn(LD_BUG, "Freelist length for %d-byte chunks may have been "
"messed up somehow.", (int)freelists[i].alloc_size);
log_warn(LD_BUG, "There were %d chunks at the start. I decided to "
"keep %d. I wanted to free %d. I freed %d. I somehow think "
"I have %d left to free.",
freelists[i].cur_length, n_to_skip, orig_n_to_free,
n_freed, n_to_free);
}
// tor_assert(!n_to_free);
freelists[i].cur_length = new_length;
}
freelists[i].lowest_length = freelists[i].cur_length;