mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert "bpo-17852: Maintain a list of BufferedWriter objects. Flush them on exit. (#1908)" (#3337)

Browse source 
This reverts commit e38d12ed34.
This commit is contained in:
Neil Schemenauer 2017-09-04 22:13:17 -07:00 • committed by GitHub
parent e38d12ed34
commit db564238db
5 changed files with 1 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Modules/_io/bufferedio.c
View file

@ -196,7 +196,7 @@ bufferediobase_write(PyObject *self, PyObject *args)
}
typedef struct _buffered {
typedef struct {
PyObject_HEAD
PyObject *raw;
@ -240,18 +240,8 @@ typedef struct _buffered {
PyObject *dict;
PyObject *weakreflist;
/* a doubly-linked chained list of "buffered" objects that need to
be flushed when the process exits */
struct _buffered *next, *prev;
} buffered;
/* the actual list of buffered objects */
static buffered buffer_list_end = {
.next = &buffer_list_end,
.prev = &buffer_list_end
};
/*
Implementation notes:
@ -396,15 +386,6 @@ _enter_buffered_busy(buffered *self)
(self->buffer_size * (size / self->buffer_size)))
static void
remove_from_linked_list(buffered *self)
{
self->next->prev = self->prev;
self->prev->next = self->next;
self->prev = NULL;
self->next = NULL;
}
static void
buffered_dealloc(buffered *self)
{
@ -413,8 +394,6 @@ buffered_dealloc(buffered *self)
return;
_PyObject_GC_UNTRACK(self);
self->ok = 0;
if (self->next != NULL)
remove_from_linked_list(self);
if (self->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *)self);
Py_CLEAR(self->raw);
@ -1838,33 +1817,10 @@ _io_BufferedWriter___init___impl(buffered *self, PyObject *raw,
self->fast_closed_checks = (Py_TYPE(self) == &PyBufferedWriter_Type &&
Py_TYPE(raw) == &PyFileIO_Type);
if (self->next == NULL) {
self->prev = &buffer_list_end;
self->next = buffer_list_end.next;
buffer_list_end.next->prev = self;
buffer_list_end.next = self;
}
self->ok = 1;
return 0;
}
/*
* Ensure all buffered writers are flushed before proceeding with
* normal shutdown. Otherwise, if the underlying file objects get
* finalized before the buffered writer wrapping it then any buffered
* data will be lost.
*/
void _PyIO_atexit_flush(void)
{
while (buffer_list_end.next != &buffer_list_end) {
buffered *buf = buffer_list_end.next;
remove_from_linked_list(buf);
buffered_flush(buf, NULL);
PyErr_Clear();
}
}
static Py_ssize_t
_bufferedwriter_raw_write(buffered *self, char *start, Py_ssize_t len)
{