No OneTemporary
Actions

Authored By

Unknown

Size

21 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/util/nacl/module.cpp b/util/nacl/module.cpp
	index 6fa182f8..5cf00382 100644
	--- a/util/nacl/module.cpp
	+++ b/util/nacl/module.cpp
	@@ -1,125 +1,125 @@
	#ifdef NACL

	/* talks to chrome via the nacl stuff */

	#include <ppapi/cpp/instance.h>
	#include <ppapi/cpp/module.h>
	#include <ppapi/cpp/var.h>
	#include <ppapi/cpp/dev/scriptable_object_deprecated.h>
	#include <SDL/SDL.h>
	#include <SDL/SDL_nacl.h>
	#include <string>
	#include "../../main.h"
	#include "network-system.h"
	#include "../funcs.h"

	namespace nacl{
	class PaintownScript: public pp::deprecated::ScriptableObject {
	public:
	virtual bool HasMethod(const pp::Var& method, pp::Var* exception);
	virtual pp::Var Call(const pp::Var& method, const std::vector<pp::Var>& args,pp::Var* exception);
	};

	class PaintownInstance : public pp::Instance {
	public:
	explicit PaintownInstance(PP_Instance instance, pp::Core * core):
	pp::Instance(instance),
	core(core){
	the_instance = this;
	}
	virtual ~PaintownInstance() {}
	static PaintownInstance * the_instance;
	pp::Core * core;

	static int launch(void * arg){
	int argc = 1;
	char * argv[1] = {"paintown"};
	Global::debug(0) << "Run paintown main" << std::endl;
	paintown_main(argc, argv);
	return 0;
	}

	/* set up the viewport and run the game as usual */
	void run(){
	+ Nacl::NetworkSystem * system = new Nacl::NetworkSystem("http://localhost:5103/", the_instance, core);
	+ Storage::setInstance(system);
	SDL_NACL_SetInstance(pp_instance(), 640, 480);
	int ok = SDL_Init(SDL_INIT_VIDEO \|
	SDL_INIT_AUDIO \|
	SDL_INIT_TIMER \|
	SDL_INIT_JOYSTICK \|
	SDL_INIT_NOPARACHUTE);
	Global::debug(0) << "SDL Init: " << ok << std::endl;

	// Util::setDataPath("http://localhost:5103/data/");
	- Nacl::NetworkSystem * system = new Nacl::NetworkSystem("http://localhost:5103/", the_instance, core);
	- Storage::setInstance(system);
	Util::Thread::Id thread;
	Util::Thread::createThread(&thread, NULL, (Util::Thread::ThreadFunction) launch, NULL);
	Global::debug(0) << "Running thread " << thread << std::endl;
	// Global::debug(0) << "Run thread " << Util::Thread::createThread(&thread, NULL, launch, NULL) << std::endl;
	// system->run();
	}

	virtual pp::Var GetInstanceObject(){
	PaintownScript * object = new PaintownScript();
	return pp::Var(this, object);
	}

	/* when the browser does paintownModule.postMessage('run') this will
	* get executed.
	*/
	virtual void HandleMessage(const pp::Var& var_message){
	if (!var_message.is_string()){
	return;
	}

	std::string message = var_message.AsString();
	if (message == "run"){
	run();
	}
	}
	};
	PaintownInstance * PaintownInstance::the_instance;

	bool PaintownScript::HasMethod(const pp::Var& method, pp::Var* exception){
	if (!method.is_string()){
	return false;
	}

	std::string name = method.AsString();
	if (name == "run"){
	return true;
	}
	return false;
	}

	pp::Var PaintownScript::Call(const pp::Var& method, const std::vector<pp::Var>& args,pp::Var* exception){
	if (!method.is_string()){
	return false;
	}

	std::string name = method.AsString();
	if (name == "run"){
	PaintownInstance::the_instance->run();
	}

	return pp::Var();
	}

	class PaintownModule : public pp::Module {
	public:
	PaintownModule() : pp::Module() {}
	virtual ~PaintownModule() {}

	virtual pp::Instance* CreateInstance(PP_Instance instance) {
	return new PaintownInstance(instance, core());
	}
	};
	}

	namespace pp{
	Module * CreateModule(){
	return new nacl::PaintownModule();
	}
	}

	#endif
	diff --git a/util/nacl/network-system.cpp b/util/nacl/network-system.cpp
	index c3e11dab..7c4283b8 100644
	--- a/util/nacl/network-system.cpp
	+++ b/util/nacl/network-system.cpp
	@@ -1,559 +1,610 @@
	#ifdef NACL

	/* documentation for ppapi
	* http://code.google.com/chrome/nativeclient/docs/reference/peppercpp/inherits.html
	*/

	/* issues with getting data
	* 1. the function that starts the game is called from the main chrome thread
	* which starts from a javascript call to module.PostMessage('run').
	* ...
	*
	*/

	#include <unistd.h>
	#include <errno.h>
	#include "network-system.h"
	#include "../funcs.h"
	#include "../debug.h"
	#include <ppapi/c/pp_errors.h>
	#include <ppapi/cpp/url_loader.h>
	#include <ppapi/cpp/url_request_info.h>
	#include <ppapi/cpp/url_response_info.h>
	#include <ppapi/cpp/completion_callback.h>

	using std::string;
	using std::map;

	namespace Nacl{

	typedef Path::AbsolutePath AbsolutePath;
	typedef Path::RelativePath RelativePath;

	enum RequestType{
	Exists
	};

	struct Request{
	RequestType type;
	AbsolutePath absolute;
	RelativePath relative;
	bool complete;
	bool success;
	};

	Request operation;

	struct NaclRequest{
	virtual ~NaclRequest(){
	}

	virtual void start() = 0;
	};

	struct NaclRequestOpen: public NaclRequest {
	NaclRequestOpen(pp::Instance * instance, const string & url, Manager * manager):
	request(instance),
	loader(instance),
	url(url),
	manager(manager){
	request.SetURL(url);
	request.SetMethod("GET");
	}

	void start(){
	Global::debug(1) << "Request open for url " << url << std::endl;
	pp::CompletionCallback callback(&NaclRequestOpen::onFinish, this);
	int32_t ok = loader.Open(request, callback);
	Global::debug(1) << "Open " << ok << std::endl;
	if (ok != PP_OK_COMPLETIONPENDING){
	// Global::debug(0) << "Call on main thread" << std::endl;
	// core->CallOnMainThread(0, callback, ok);
	callback.Run(ok);
	}
	Global::debug(1) << "Callback running" << std::endl;
	}

	static void onFinish(void * me, int32_t result){
	NaclRequestOpen * self = (NaclRequestOpen*) me;
	self->finish(result);
	}

	void finish(int32_t result);

	pp::URLRequestInfo request;
	pp::URLLoader loader;
	string url;
	Manager * manager;
	};

	struct NaclRequestRead: public NaclRequest {
	NaclRequestRead(pp::URLLoader & loader, Manager * manager, void * buffer, int read):
	loader(loader),
	manager(manager),
	buffer(buffer),
	read(read){
	}

	void start(){
	pp::CompletionCallback callback(&NaclRequestRead::onFinish, this);
	int32_t ok = loader.ReadResponseBody(buffer, read, callback);
	Global::debug(1) << "Read " << ok << std::endl;
	if (ok != PP_OK_COMPLETIONPENDING){
	// Global::debug(0) << "Call on main thread" << std::endl;
	// core->CallOnMainThread(0, callback, ok);
	callback.Run(ok);
	}
	Global::debug(1) << "Callback running" << std::endl;
	}

	static void onFinish(void * me, int32_t result){
	NaclRequestRead * self = (NaclRequestRead*) me;
	self->finish(result);
	}

	void finish(int32_t result);

	pp::URLLoader loader;
	Manager * manager;
	void * buffer;
	int read;
	};

	class Manager{
	public:
	Manager(pp::Instance * instance, pp::Core * core):
	instance(instance),
	core(core),
	factory(this){
	next = 2;
	}

	pp::Instance * instance;
	pp::Core * core;
	Util::ReferenceCount<NaclRequest> request;
	pp::CompletionCallbackFactory<Manager> factory;

	map<int, Util::ReferenceCount<NaclRequest> > fileTable;

	int next;

	struct OpenFileData{
	const char * path;
	int file;
	};

	struct ReadFileData{
	int file;
	void * buffer;
	/* how much to read */
	int count;
	/* how much was read */
	int read;
	};

	+ struct CloseFileData{
	+ int fd;
	+ };
	+
	OpenFileData openFileData;
	ReadFileData readFileData;
	+ CloseFileData closeFileData;

	Util::Thread::LockObject lock;
	volatile bool done;

	int openFile(const char * path){
	Util::Thread::ScopedLock scoped(lock);
	done = false;
	openFileData.path = path;
	openFileData.file = -1;
	pp::CompletionCallback callback(&Manager::doOpenFile, this);
	core->CallOnMainThread(0, callback, 0);
	lock.wait(done);
	return openFileData.file;
	}

	bool exists(const string & path){
	Util::Thread::ScopedLock scoped(lock);
	done = false;
	openFileData.path = path.c_str();
	openFileData.file = -1;
	pp::CompletionCallback callback(&Manager::doOpenFile, this);
	core->CallOnMainThread(0, callback, 0);
	lock.wait(done);
	return openFileData.file != -1;
	}

	+ int close(int fd){
	+ Util::Thread::ScopedLock scoped(lock);
	+ if (fileTable.find(fd) == fileTable.end()){
	+ return -1;
	+ /* set errno to EBADF */
	+ }
	+
	+ done = false;
	+ closeFileData.fd = fd;
	+
	+ pp::CompletionCallback callback(&Manager::doCloseFile, this);
	+ core->CallOnMainThread(0, callback, 0);
	+ lock.wait(done);
	+ return 0;
	+ }
	+
	+ static void doCloseFile(void * self, int32_t result){
	+ Manager * manager = (Manager*) self;
	+ manager->continueCloseFile();
	+ }
	+
	+ /* the destructor for the NaclRequestOpen has to occur in the main thread */
	+ void continueCloseFile(){
	+ fileTable.erase(fileTable.find(closeFileData.fd));
	+ lock.lockAndSignal(done, true);
	+ }
	+
	ssize_t readFile(int fd, void * buffer, size_t count){
	Util::Thread::ScopedLock scoped(lock);
	if (fileTable.find(fd) == fileTable.end()){
	return EBADF;
	}

	done = false;
	readFileData.file = fd;
	readFileData.buffer = buffer;
	readFileData.count = count;
	readFileData.read = 0;
	pp::CompletionCallback callback(&Manager::doReadFile, this);
	core->CallOnMainThread(0, callback, 0);
	lock.wait(done);
	return readFileData.read;
	}

	static void doReadFile(void * self, int32_t result){
	Manager * manager = (Manager*) self;
	manager->continueReadFile();
	}

	void continueReadFile(){
	+ /* hack to get the open request.. */
	Util::ReferenceCount<NaclRequestOpen> open = fileTable[readFileData.file].convert<NaclRequestOpen>();
	request = new NaclRequestRead(open->loader, this, readFileData.buffer, readFileData.count);
	request->start();
	}

	/* called by the main thread */
	static void doOpenFile(void * self, int32_t result){
	Manager * manager = (Manager*) self;
	manager->continueOpenFile();
	}

	void continueOpenFile(){
	request = new NaclRequestOpen(instance, openFileData.path, this);
	request->start();
	}

	int nextFileDescriptor(){
	int n = next;
	next += 1;
	return n;
	}

	void requestComplete(){
	lock.lockAndSignal(done, true);
	}

	void success(NaclRequestOpen & open){
	pp::URLResponseInfo info = open.loader.GetResponseInfo();
	if (info.GetStatusCode() == 200){
	openFileData.file = nextFileDescriptor();
	fileTable[openFileData.file] = request;
	} else {
	openFileData.file = -1;
	}

	requestComplete();
	}

	void failure(NaclRequestOpen & open){
	openFileData.file = -1;
	requestComplete();
	}

	void success(NaclRequestRead & request, int read){
	readFileData.read = read;
	requestComplete();
	}
	};

	void NaclRequestOpen::finish(int32_t result){
	if (result == 0){
	manager->success(*this);
	} else {
	manager->failure(*this);
	}
	}

	void NaclRequestRead::finish(int32_t result){
	manager->success(*this, result);
	}

	NetworkSystem::NetworkSystem(const string & serverPath, pp::Instance * instance, pp::Core * core):
	instance(instance),
	serverPath(serverPath),
	manager(new Manager(instance, core)){
	}

	/* TODO */
	NetworkSystem::~NetworkSystem(){
	}

	/* TODO */
	AbsolutePath NetworkSystem::find(const RelativePath & path){
	return Util::getDataPath2().join(path);
	}

	/* TODO */
	RelativePath NetworkSystem::cleanse(const AbsolutePath & path){
	return RelativePath();
	}

	bool NetworkSystem::exists(const RelativePath & path){
	try{
	AbsolutePath absolute = find(path);
	return true;
	} catch (const Storage::NotFound & found){
	return false;
	}
	}

	/*
	class Handler{
	public:
	Handler(pp::Instance * instance, const AbsolutePath & path, NetworkSystem * system):
	request(instance),
	loader(instance),
	factory(this),
	http(false),
	system(system){
	request.SetURL(path.path());
	request.SetMethod("GET");
	}

	virtual void start(){
	pp::CompletionCallback callback = factory.NewCallback(&Handler::OnOpen);
	int32_t ok = loader.Open(request, callback);
	Global::debug(0) << "Open " << ok << std::endl;
	if (ok != PP_OK_COMPLETIONPENDING){
	callback.Run(ok);
	}
	Global::debug(0) << "Callback running" << std::endl;
	}

	virtual void OnOpen(int32_t ok){
	Global::debug(0) << "Opened! " << ok << std::endl;
	system->run2();
	}

	pp::URLRequestInfo request;
	pp::URLLoader loader;
	pp::CompletionCallbackFactory<Handler> factory;
	volatile bool http;
	NetworkSystem * system;
	};
	*/

	/*
	void NetworkSystem::run(){
	// manager->run();
	Util::Thread::Id thread;
	Util::Thread::createThread(&thread, NULL, &Manager::run, manager);
	// manager->run();
	}
	*/

	bool NetworkSystem::exists(const AbsolutePath & path){
	/*
	Global::debug(0) << "Checking for " << path.path() << std::endl;
	pp::CompletionCallback::Block blocking;
	pp::CompletionCallback callback(blocking);
	pp::URLRequestInfo request(instance);
	pp::URLLoader loader(instance);
	string url = serverPath + path.path();
	Global::debug(0) << "Url: " << url << std::endl;
	// request.SetURL(serverPath + path.path());
	request.SetURL("/" + path.path());
	request.SetMethod("GT");
	int32_t ok = loader.Open(request, callback);
	Global::debug(0) << "Ok: " << ok << std::endl;
	if (ok == PP_OK){
	return true;
	} else {
	return false;
	}
	*/

	return manager->exists(path.path());

	#if 0
	Global::debug(0) << "Getting portal lock" << std::endl;
	if (portal.acquire() != 0){
	Global::debug(0) << "Lock failed!" << std::endl;
	}
	/*
	Global::debug(0) << "Getting portal lock again" << std::endl;
	if (portal.acquire() != 0){
	Global::debug(0) << "Lock failed again!" << std::endl;
	}
	Global::debug(0) << "Somehow got the portal lock twice??" << std::endl;
	*/
	operation.type = Exists;
	operation.absolute = path;
	operation.complete = false;
	operation.success = false;
	Global::debug(0) << "Request open" << std::endl;
	run();
	// portal.signal();
	Global::debug(0) << "Waiting on portal" << std::endl;
	portal.wait(operation.complete);
	portal.release();
	Global::debug(0) << "Request open complete" << std::endl;

	return operation.success;
	/*
	Handler handler(instance, path);
	handler.start();
	handler.wait();
	return false;
	*/
	#endif
	}

	/* TODO */
	std::vector<AbsolutePath> NetworkSystem::getFilesRecursive(const AbsolutePath & dataPath, const std::string & find, bool caseInsensitive){
	std::vector<AbsolutePath> paths;
	return paths;
	}

	/* TODO */
	std::vector<AbsolutePath> NetworkSystem::getFiles(const AbsolutePath & dataPath, const std::string & find, bool caseInsensitive){
	std::vector<AbsolutePath> paths;
	return paths;
	}

	/* TODO */
	AbsolutePath NetworkSystem::configFile(){
	return AbsolutePath("paintownrc");
	}

	/* TODO */
	AbsolutePath NetworkSystem::userDirectory(){
	return AbsolutePath("paintownrc");
	}

	/* TODO */
	std::vector<AbsolutePath> NetworkSystem::findDirectories(const RelativePath & path){
	return std::vector<AbsolutePath>();
	}

	/* TODO */
	AbsolutePath NetworkSystem::findInsensitive(const RelativePath & path){
	return AbsolutePath();
	}

	/* TODO */
	AbsolutePath NetworkSystem::lookupInsensitive(const AbsolutePath & directory, const RelativePath & path){
	return AbsolutePath();
	}

	int NetworkSystem::libcOpen(const char * path, int mode, int params){
	return manager->openFile(path);
	}

	ssize_t NetworkSystem::libcRead(int fd, void * buf, size_t count){
	return manager->readFile(fd, buf, count);
	}

	+int NetworkSystem::libcClose(int fd){
	+ return manager->close(fd);
	+}
	+
	}

	/* NOTE FIXME Missing I/O in Native Client */

	Nacl::NetworkSystem & getSystem(){
	return (Nacl::NetworkSystem&) Storage::instance();
	}

	extern "C" {

	/* http://sourceware.org/binutils/docs-2.21/ld/Options.html#index-g_t_002d_002dwrap_003d_0040var_007bsymbol_007d-261
	* --wrap=symbol
	* Use a wrapper function for symbol. Any undefined reference to symbol will be resolved to __wrap_symbol. Any undefined reference to __real_symbol will be resolved to symbol.
	*/
	int __wrap_open(const char * path, int mode, int params){
	return getSystem().libcOpen(path, mode, params);
	}

	ssize_t __wrap_read(int fd, void * buf, size_t count){
	return getSystem().libcRead(fd, buf, count);
	}

	+extern int __real_close(int fd);
	+
	+int __wrap_close(int fd){
	+ /* we may be given a file descriptor that we do not own, probably
	+ * because some file descriptors are really tied to sockets so
	+ * if we don't own the fd then pass it to the real close function.
	+ */
	+ int ok = getSystem().libcClose(fd);
	+ if (ok == -1){
	+ return __real_close(fd);
	+ }
	+ return ok;
	+}
	+
	int pipe (int filedes[2]){
	return -1;
	}

	int mkdir (const char *filename, mode_t mode){
	return -1;
	}

	int access(const char *filename, int how){
	return -1;
	}

	char * getcwd (char *buffer, size_t size){
	return NULL;
	}

	int lstat (const char path, struct stat buf){
	return -1;
	}

	int rmdir (const char *filename){
	return -1;
	}

	int chdir (const char *filename){
	return -1;
	}

	int setuid (uid_t newuid){
	return 0;
	}

	int seteuid (uid_t uid){
	return 0;
	}

	uid_t geteuid (void){
	return NULL;
	}

	int setgid (gid_t gid){
	return 0;
	}

	gid_t getgid (void){
	return NULL;
	}

	int setegid (gid_t gid){
	return 0;
	}

	gid_t getegid (void){
	return NULL;
	}

	char * getlogin (void){
	return NULL;
	}

	uid_t getuid(void){
	return NULL;
	}

	struct passwd * getpwuid (uid_t uid){
	return NULL;
	}

	struct passwd * getpwnam (const char *name){
	return NULL;
	}

	struct group * getgrnam(const char *name){
	return NULL;
	}

	struct group * getgrgid(gid_t gid){
	return NULL;
	}

	int link (const char oldname, const char newname){
	return -1;
	}

	int unlink (const char *filename){
	return -1;
	}

	int kill(pid_t pid, int sig){
	return -1;
	}

	}

	#endif
	diff --git a/util/nacl/network-system.h b/util/nacl/network-system.h
	index 6faa9935..2f26db2b 100644
	--- a/util/nacl/network-system.h
	+++ b/util/nacl/network-system.h
	@@ -1,55 +1,56 @@
	#ifndef _paintown_network_system_h
	#define _paintown_network_system_h

	#ifdef NACL

	#include <string>
	#include "../file-system.h"
	#include "../thread.h"

	namespace pp{
	class Instance;
	class Core;
	}

	namespace Nacl{

	typedef Path::AbsolutePath AbsolutePath;
	typedef Path::RelativePath RelativePath;

	class Manager;
	class NetworkSystem: public Storage::System {
	public:
	NetworkSystem(const std::string & serverPath, pp::Instance * instance, pp::Core * core);
	virtual ~NetworkSystem();

	virtual AbsolutePath find(const RelativePath & path);
	virtual RelativePath cleanse(const AbsolutePath & path);
	virtual bool exists(const RelativePath & path);
	virtual bool exists(const AbsolutePath & path);
	virtual std::vector<AbsolutePath> getFilesRecursive(const AbsolutePath & dataPath, const std::string & find, bool caseInsensitive = false);
	virtual std::vector<AbsolutePath> getFiles(const AbsolutePath & dataPath, const std::string & find, bool caseInsensitive = false);
	virtual AbsolutePath configFile();
	virtual AbsolutePath userDirectory();
	virtual std::vector<AbsolutePath> findDirectories(const RelativePath & path);
	virtual AbsolutePath findInsensitive(const RelativePath & path);
	virtual AbsolutePath lookupInsensitive(const AbsolutePath & directory, const RelativePath & path);

	public:
	int libcOpen(const char * path, int mode, int params);
	ssize_t libcRead(int fd, void * buf, size_t count);
	+ int libcClose(int fd);

	protected:
	pp::Instance * instance;
	pp::Core * core;
	std::string serverPath;
	/* used to communicate to the main NACL thread */
	// Util::Thread::LockObject portal;
	Manager * manager;
	};

	}

	#endif

	#endif

File Metadata

Mime Type: text/x-diff
Expires: Thu, Jun 11, 10:23 AM (3 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 68384
Default Alt Text: (21 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions