Differential D36 Diff 86 intern/cycles/device/device_network.h

Changeset View

Standalone View

intern/cycles/device/device_network.h

Context not available.
	#ifndef __DEVICE_NETWORK_H__	#ifndef __DEVICE_NETWORK_H__
	#define __DEVICE_NETWORK_H__	#define __DEVICE_NETWORK_H__

	#ifdef WITH_NETWORK	#if 1 \|\| defined(WITH_NETWORK)
		brechtUnsubmitted Not Done Inline Actions Why #if 1? brecht: Why #if 1?

	#include <boost/archive/text_iarchive.hpp>	#include <boost/archive/text_iarchive.hpp>
	#include <boost/archive/text_oarchive.hpp>	#include <boost/archive/text_oarchive.hpp>
Context not available.
	#include <boost/thread.hpp>	#include <boost/thread.hpp>

	#include <iostream>	#include <iostream>
		#include <sstream>
		#include <deque>

	#include "buffers.h"	#include "buffers.h"

Context not available.

	~RPCSend()	~RPCSend()
	{	{
	if(!sent)
	fprintf(stderr, "Error: RPC %s not sent\n", name.c_str());
	}	}

	void add(const device_memory& mem)	void add(const device_memory& mem)
Context not available.
	archive & task.offset & task.stride;	archive & task.offset & task.stride;
	archive & task.shader_input & task.shader_output & task.shader_eval_type;	archive & task.shader_input & task.shader_output & task.shader_eval_type;
	archive & task.shader_x & task.shader_w;	archive & task.shader_x & task.shader_w;
		archive & task.need_finish_queue;
	}	}

	void add(const RenderTile& tile)	void add(const RenderTile& tile)
	{	{
	archive & tile.x & tile.y & tile.w & tile.h;	archive & tile.x & tile.y & tile.w & tile.h;
	archive & tile.start_sample & tile.num_samples & tile.sample;	archive & tile.start_sample & tile.num_samples & tile.sample;
	archive & tile.offset & tile.stride;	archive & tile.resolution & tile.offset & tile.stride;
	archive & tile.buffer & tile.rng_state;	archive & tile.buffer & tile.rng_state;
	}	}

Context not available.
	boost::asio::buffer(header_str),	boost::asio::buffer(header_str),
	boost::asio::transfer_all(), error);	boost::asio::transfer_all(), error);

	if(error.value())
	cout << "Network send error: " << error.message() << "\n";

	/* then send actual data */	/* then send actual data */
	boost::asio::write(socket,	boost::asio::write(socket,
	boost::asio::buffer(archive_str),	boost::asio::buffer(archive_str),
	boost::asio::transfer_all(), error);	boost::asio::transfer_all(), error);

	if(error.value())
	cout << "Network send error: " << error.message() << "\n";

	sent = true;	sent = true;
	}	}
Context not available.
	boost::asio::write(socket,	boost::asio::write(socket,
	boost::asio::buffer(buffer, size),	boost::asio::buffer(buffer, size),
	boost::asio::transfer_all(), error);	boost::asio::transfer_all(), error);

	if(error.value())
	cout << "Network send error: " << error.message() << "\n";
	}	}

	protected:	protected:
Context not available.
	vector<char> header(8);	vector<char> header(8);
	size_t len = boost::asio::read(socket, boost::asio::buffer(header));	size_t len = boost::asio::read(socket, boost::asio::buffer(header));

		static int race_detect;
		if (__sync_add_and_fetch(&race_detect, 1) != 1) {
		raise(SIGTRAP);
		brechtUnsubmitted Not Done Inline Actions I don't think this is portable, would not compile with visual studio. This also seems like temporary debugging code or is it really intended to be here? If it's not debugging code, it's not clear to me why we would raise SIGTRAP, would prefer to handle errors a bit more gracefully and at least print an error message. brecht: I don't think this is portable, would not compile with visual studio. This also seems like…
		}

	/* verify if we got something */	/* verify if we got something */
	if(len == header.size()) {	if(len == header.size()) {
	/* decode header */	/* decode header */
Context not available.
	size_t data_size;	size_t data_size;

	if((header_stream >> hex >> data_size)) {	if((header_stream >> hex >> data_size)) {

	vector<char> data(data_size);	vector<char> data(data_size);
	size_t len = boost::asio::read(socket, boost::asio::buffer(data));	size_t len = boost::asio::read(socket, boost::asio::buffer(data));

Context not available.

	*archive & name;	*archive & name;
	}	}
	else	else {
	cout << "Network receive error: data size doens't match header\n";	//Network receive error: data size doesn't match header";
		raise(SIGTRAP);
		}
		}
		else {
		//Network receive error: can't decode data size from header";
		raise(SIGTRAP);
	}	}
	else
	cout << "Network receive error: can't decode data size from header\n";
	}	}
	else	else {
	cout << "Network receive error: invalid header size\n";	//Network receive error: invalid header size";
		raise(SIGTRAP);
		}

		if (__sync_add_and_fetch(&race_detect, -1) != 0) {
		raise(SIGTRAP);
		}
	}	}

	~RPCReceive()	~RPCReceive()
Context not available.
	void read_buffer(void *buffer, size_t size)	void read_buffer(void *buffer, size_t size)
	{	{
	size_t len = boost::asio::read(socket, boost::asio::buffer(buffer, size));	size_t len = boost::asio::read(socket, boost::asio::buffer(buffer, size));

	if(len != size)
	cout << "Network receive error: buffer size doesn't match expected size\n";
	}	}

	void read(DeviceTask& task)	void read(DeviceTask& task)
Context not available.

	*archive & type & task.x & task.y & task.w & task.h;	*archive & type & task.x & task.y & task.w & task.h;
	*archive & task.rgba_byte & task.rgba_half & task.buffer & task.sample & task.num_samples;	*archive & task.rgba_byte & task.rgba_half & task.buffer & task.sample & task.num_samples;
	*archive & task.resolution & task.offset & task.stride;	*archive & task.offset & task.stride;
	*archive & task.shader_input & task.shader_output & task.shader_eval_type;	*archive & task.shader_input & task.shader_output & task.shader_eval_type;
	*archive & task.shader_x & task.shader_w;	*archive & task.shader_x & task.shader_w;
		*archive & task.need_finish_queue;

	task.type = (DeviceTask::Type)type;	task.type = (DeviceTask::Type)type;
	}	}
Context not available.
	*archive & tile.x & tile.y & tile.w & tile.h;	*archive & tile.x & tile.y & tile.w & tile.h;
	*archive & tile.start_sample & tile.num_samples & tile.sample;	*archive & tile.start_sample & tile.num_samples & tile.sample;
	*archive & tile.resolution & tile.offset & tile.stride;	*archive & tile.resolution & tile.offset & tile.stride;
	*archive & tile.buffer & tile.rng_state & tile.rgba_byte & tile.rgba_half;	*archive & tile.buffer & tile.rng_state;

	tile.buffers = NULL;	tile.buffers = NULL;
	}	}
Context not available.
	delete work;	delete work;
	}	}

	list<string> get_server_list()	vector<string> get_server_list()
	{	{
	list<string> result;	vector<string> result;

	mutex.lock();	mutex.lock();
	result = servers;	result = vector<string>(servers.begin(), servers.end());
		brechtUnsubmitted Not Done Inline Actions It's not clear to me why this line was changed, both would copy the vector the same way? brecht: It's not clear to me why this line was changed, both would copy the vector the same way?
	mutex.unlock();	mutex.unlock();

	return result;	return result;
Context not available.
	void handle_receive_from(const boost::system::error_code& error, size_t size)	void handle_receive_from(const boost::system::error_code& error, size_t size)
	{	{
	if(error) {	if(error) {
	cout << "Server discovery receive error: " << error.message() << "\n";	//Server discovery receive error
		brechtUnsubmitted Not Done Inline Actions Not clear why error messages were removed. brecht: Not clear why error messages were removed.
	return;	return;
	}	}

Context not available.
	mutex.lock();	mutex.lock();

	/* add address if it's not already in the list */	/* add address if it's not already in the list */
	bool found = false;	bool found = std::find(servers.begin(), servers.end(),
		address) != servers.end();
	foreach(string& server, servers)
	if(server == address)
	found = true;

	if(!found)	if(!found)
	servers.push_back(address);	servers.push_back(address);
Context not available.
	/* buffer and endpoint for receiving messages */	/* buffer and endpoint for receiving messages */
	char receive_buffer[256];	char receive_buffer[256];
	boost::asio::ip::udp::endpoint receive_endpoint;	boost::asio::ip::udp::endpoint receive_endpoint;

		// os, version, devices, status, host name, group name, ip as far as fields go
		struct ServerInfo {
		string blender_version;
		brechtUnsubmitted Not Done Inline Actions This should be cycles_version, which may be a blender version for now but it's supposed to work standalone too. brecht: This should be cycles_version, which may be a blender version for now but it's supposed to work…
		string os;
		int device_count;
		string status;
		string host_name;
		string group_name;
		string host_addr;
		};

	/* collection of server addresses in list */	/* collection of server addresses in list */
	bool collect_servers;	bool collect_servers;
	list<string> servers;	vector<string> servers;
	};	};

	CCL_NAMESPACE_END	CCL_NAMESPACE_END
Context not available.