Differences From Artifact [631572b875]:
- File
src/OFStream.m
— part of check-in
[0ddaac3f5b]
at
2020-11-05 00:24:29
on branch trunk
— Avoid -[allocMemoryWithSize:] for temporary memory
-[allocMemoryWithSize:] has book keeping overhead that is unnecessary
for temporary memory. (user: js, size: 39862) [annotate] [blame] [check-ins using]
To Artifact [c39ea2325e]:
- File src/OFStream.m — part of check-in [da1fb6b21c] at 2020-11-05 02:27:35 on branch trunk — Further reduce usage of -[allocMemoryWithSize:] (user: js, size: 39591) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 |
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (bool)lowlevelIsAtEndOfStream
{
OF_UNRECOGNIZED_SELECTOR
}
- (size_t)lowlevelReadIntoBuffer: (void *)buffer
| > > > > > > > > | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 |
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
free(_readBufferMemory);
free(_writeBuffer);
[super dealloc];
}
- (bool)lowlevelIsAtEndOfStream
{
OF_UNRECOGNIZED_SELECTOR
}
- (size_t)lowlevelReadIntoBuffer: (void *)buffer
|
| ︙ | ︙ | |||
139 140 141 142 143 144 145 |
bytesRead = [self
lowlevelReadIntoBuffer: tmp
length: MIN_READ_SIZE];
if (bytesRead > length) {
memcpy(buffer, tmp, length);
| < | | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 |
bytesRead = [self
lowlevelReadIntoBuffer: tmp
length: MIN_READ_SIZE];
if (bytesRead > length) {
memcpy(buffer, tmp, length);
readBuffer = of_malloc(bytesRead - length, 1);
memcpy(readBuffer, tmp + length,
bytesRead - length);
_readBuffer = _readBufferMemory = readBuffer;
_readBufferLength = bytesRead - length;
return length;
|
| ︙ | ︙ | |||
162 163 164 165 166 167 168 |
length: length];
}
if (length >= _readBufferLength) {
size_t ret = _readBufferLength;
memcpy(buffer, _readBuffer, _readBufferLength);
| | | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 |
length: length];
}
if (length >= _readBufferLength) {
size_t ret = _readBufferLength;
memcpy(buffer, _readBuffer, _readBufferLength);
free(_readBufferMemory);
_readBuffer = _readBufferMemory = NULL;
_readBufferLength = 0;
return ret;
} else {
memcpy(buffer, _readBuffer, length);
|
| ︙ | ︙ | |||
750 751 752 753 754 755 756 | if (retLength > 0 && _readBuffer[retLength - 1] == '\r') retLength--; ret = [OFString stringWithCString: _readBuffer encoding: encoding length: retLength]; | | | 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 | if (retLength > 0 && _readBuffer[retLength - 1] == '\r') retLength--; ret = [OFString stringWithCString: _readBuffer encoding: encoding length: retLength]; free(_readBufferMemory); _readBuffer = _readBufferMemory = NULL; _readBufferLength = 0; _waitingForDelimiter = false; return ret; } |
| ︙ | ︙ | |||
789 790 791 792 793 794 795 |
length: retLength];
} @catch (id e) {
if (bufferLength > 0) {
/*
* Append data to _readBuffer
* to prevent loss of data.
*/
| | < | < | | < | < | > | | 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 |
length: retLength];
} @catch (id e) {
if (bufferLength > 0) {
/*
* Append data to _readBuffer
* to prevent loss of data.
*/
readBuffer = of_malloc(
_readBufferLength +
bufferLength, 1);
memcpy(readBuffer, _readBuffer,
_readBufferLength);
memcpy(readBuffer +
_readBufferLength,
buffer, bufferLength);
free(_readBufferMemory);
_readBuffer = readBuffer;
_readBufferMemory = readBuffer;
_readBufferLength +=
bufferLength;
}
@throw e;
} @finally {
free(retCString);
}
readBuffer = of_malloc(bufferLength - i - 1, 1);
if (readBuffer != NULL)
memcpy(readBuffer, buffer + i + 1,
bufferLength - i - 1);
free(_readBufferMemory);
_readBuffer = _readBufferMemory = readBuffer;
_readBufferLength = bufferLength - i - 1;
_waitingForDelimiter = false;
return ret;
}
}
/* There was no newline or \0 */
if (bufferLength > 0) {
readBuffer = of_malloc(_readBufferLength + bufferLength,
1);
memcpy(readBuffer, _readBuffer, _readBufferLength);
memcpy(readBuffer + _readBufferLength,
buffer, bufferLength);
free(_readBufferMemory);
_readBuffer = _readBufferMemory = readBuffer;
_readBufferLength += bufferLength;
}
} @finally {
free(buffer);
}
|
| ︙ | ︙ | |||
984 985 986 987 988 989 990 | return nil; } ret = [OFString stringWithCString: _readBuffer encoding: encoding length: _readBufferLength]; | | | 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 | return nil; } ret = [OFString stringWithCString: _readBuffer encoding: encoding length: _readBufferLength]; free(_readBufferMemory); _readBuffer = _readBufferMemory = NULL; _readBufferLength = 0; _waitingForDelimiter = false; return ret; } |
| ︙ | ︙ | |||
1033 1034 1035 1036 1037 1038 1039 |
length: retLength];
} @catch (id e) {
if (bufferLength > 0) {
/*
* Append data to _readBuffer
* to prevent loss of data.
*/
| | < | < | < | | < | > | | 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 |
length: retLength];
} @catch (id e) {
if (bufferLength > 0) {
/*
* Append data to _readBuffer
* to prevent loss of data.
*/
readBuffer = of_malloc(
_readBufferLength +
bufferLength, 1);
memcpy(readBuffer, _readBuffer,
_readBufferLength);
memcpy(readBuffer +
_readBufferLength,
buffer, bufferLength);
free(_readBufferMemory);
_readBuffer = readBuffer;
_readBufferMemory = readBuffer;
_readBufferLength +=
bufferLength;
}
@throw e;
} @finally {
free(retCString);
}
readBuffer = of_malloc(bufferLength - i - 1, 1);
if (readBuffer != NULL)
memcpy(readBuffer, buffer + i + 1,
bufferLength - i - 1);
free(_readBufferMemory);
_readBuffer = _readBufferMemory = readBuffer;
_readBufferLength = bufferLength - i - 1;
_waitingForDelimiter = false;
return ret;
}
}
/* Neither the delimiter nor \0 was found */
if (bufferLength > 0) {
readBuffer = of_malloc(_readBufferLength + bufferLength,
1);
memcpy(readBuffer, _readBuffer, _readBufferLength);
memcpy(readBuffer + _readBufferLength,
buffer, bufferLength);
free(_readBufferMemory);
_readBuffer = _readBufferMemory = readBuffer;
_readBufferLength += bufferLength;
}
} @finally {
free(buffer);
}
|
| ︙ | ︙ | |||
1127 1128 1129 1130 1131 1132 1133 |
{
if (_writeBuffer == NULL)
return;
[self lowlevelWriteBuffer: _writeBuffer
length: _writeBufferLength];
| | | | | 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 |
{
if (_writeBuffer == NULL)
return;
[self lowlevelWriteBuffer: _writeBuffer
length: _writeBufferLength];
free(_writeBuffer);
_writeBuffer = NULL;
_writeBufferLength = 0;
}
- (size_t)writeBuffer: (const void *)buffer
length: (size_t)length
{
if (!_buffersWrites) {
size_t bytesWritten = [self lowlevelWriteBuffer: buffer
length: length];
if (_canBlock && bytesWritten < length)
@throw [OFWriteFailedException
exceptionWithObject: self
requestedLength: length
bytesWritten: bytesWritten
errNo: 0];
return bytesWritten;
} else {
_writeBuffer = of_realloc(_writeBuffer,
_writeBufferLength + length, 1);
memcpy(_writeBuffer + _writeBufferLength, buffer, length);
_writeBufferLength += length;
return length;
}
}
|
| ︙ | ︙ | |||
1869 1870 1871 1872 1873 1874 1875 |
length: (size_t)length
{
char *readBuffer;
if (length > SIZE_MAX - _readBufferLength)
@throw [OFOutOfRangeException exception];
| | | | | | 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 |
length: (size_t)length
{
char *readBuffer;
if (length > SIZE_MAX - _readBufferLength)
@throw [OFOutOfRangeException exception];
readBuffer = of_malloc(_readBufferLength + length, 1);
memcpy(readBuffer, buffer, length);
memcpy(readBuffer + length, _readBuffer, _readBufferLength);
free(_readBufferMemory);
_readBuffer = _readBufferMemory = readBuffer;
_readBufferLength += length;
}
- (void)close
{
free(_readBufferMemory);
_readBuffer = _readBufferMemory = NULL;
_readBufferLength = 0;
free(_writeBuffer);
_writeBuffer = NULL;
_writeBufferLength = 0;
_buffersWrites = false;
_waitingForDelimiter = false;
}
@end
|