33ddb83dc1
Motivation:
IovArray implements MessageProcessor, and the processMessage method will continue to be called during iteration until it returns true. A recent commit b215794de3 changed the return value to only return true if any component of a CompositeByteBuf was added as a result of the method call. However this results in the iteration continuing, and potentially subsequent smaller buffers maybe added, which will result in out of order writes and generally corrupts data.
Modifications:
- IovArray#add should return false so that the MessageProcessor#processMessage will stop iterating.
Result:
Native transports which use IovArray will not corrupt data during gathering writes of CompositeByteBuf objects.
40 lines
1.6 KiB
Java
40 lines
1.6 KiB
Java
/*
|
|
* Copyright 2017 The Netty Project
|
|
*
|
|
* The Netty Project licenses this file to you under the Apache License,
|
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
package io.netty.channel.epoll;
|
|
|
|
import io.netty.bootstrap.Bootstrap;
|
|
import io.netty.bootstrap.ServerBootstrap;
|
|
import io.netty.channel.ChannelConfig;
|
|
import io.netty.testsuite.transport.TestsuitePermutation;
|
|
import io.netty.testsuite.transport.socket.CompositeBufferGatheringWriteTest;
|
|
|
|
import java.util.List;
|
|
|
|
public class EpollCompositeBufferGatheringWriteTest extends CompositeBufferGatheringWriteTest {
|
|
@Override
|
|
protected List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> newFactories() {
|
|
return EpollSocketTestPermutation.INSTANCE.socket();
|
|
}
|
|
|
|
@Override
|
|
protected void compositeBufferPartialWriteDoesNotCorruptDataInitServerConfig(ChannelConfig config,
|
|
int soSndBuf) {
|
|
if (config instanceof EpollChannelConfig) {
|
|
((EpollChannelConfig) config).setMaxBytesPerGatheringWrite(soSndBuf);
|
|
}
|
|
}
|
|
}
|