Projects >> kilim >>52ebc53195fa3791a477936a3134d3ff8e37123d

Chunk
Conflicting content
	
	public AffineThreadPool(int nThreads, int queueSize, String name, ExceptionHandler exHandler)
	{	
<<<<<<< HEAD
		nThreads_ = nThreads;		
		rBuffer_ = RingBuffer.createMultiProducer(KilimEvent.factory_, queueSize);
		SequenceBarrier nBarrier = rBuffer_.newBarrier();
		executorService_ = Executors.newFixedThreadPool(nThreads, new ThreadFactoryImpl(name));
		EventProcessor[] evtProcessors = new EventProcessor[nThreads];
		
=======
		nThreads_ = nThreads;
		queueSize = queueSize / nThreads;
>>>>>>> ec3a5c7934be90b46799eded2e4d7ce5b8ef8aaf
		for (int i = 0; i < nThreads; ++i)
		{
			evtProcessors[i] = new BatchEventProcessor(rBuffer_, nBarrier, new KilimEventHandler(i));
Solution content
	
	public AffineThreadPool(int nThreads, int queueSize, String name, ExceptionHandler exHandler)
	{	
		nThreads_ = nThreads;		
		rBuffer_ = RingBuffer.createMultiProducer(KilimEvent.factory_, queueSize);
		SequenceBarrier nBarrier = rBuffer_.newBarrier();
		executorService_ = Executors.newFixedThreadPool(nThreads, new ThreadFactoryImpl(name));
		EventProcessor[] evtProcessors = new EventProcessor[nThreads];
		for (int i = 0; i < nThreads; ++i)
		{
			evtProcessors[i] = new BatchEventProcessor(rBuffer_, nBarrier, new KilimEventHandler(i));
File
AffineThreadPool.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable