seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A Whole New World (clang-format edition)

Browse Source 
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
This commit is contained in:
Rémi Verschelde
2017-03-05 16:44:50 +01:00
parent 45438e9918
commit 5dbf1809c6
1318 changed files with 140051 additions and 166004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
editor/fileserver/editor_file_server.cpp
View File

@ -28,12 +28,12 @@
/*************************************************************************/
#include "editor_file_server.h"
#include "io/marshalls.h"
#include "io/marshalls.h"
#include "../editor_settings.h"
#include "io/marshalls.h"
#include "io/marshalls.h"
//#define DEBUG_PRINT(m_p) print_line(m_p)
#define DEBUG_TIME(m_what) printf("MS: %s - %lli\n",m_what,OS::get_singleton()->get_ticks_usec());
#define DEBUG_TIME(m_what) printf("MS: %s - %lli\n", m_what, OS::get_singleton()->get_ticks_usec());
//#define DEBUG_TIME(m_what)
@ -43,59 +43,55 @@ void EditorFileServer::_close_client(ClientData *cd) {
cd->efs->wait_mutex->lock();
cd->efs->to_wait.insert(cd->thread);
cd->efs->wait_mutex->unlock();
while(cd->files.size()) {
while (cd->files.size()) {
memdelete(cd->files.front()->get());
cd->files.erase(cd->files.front());
}
memdelete(cd);
}
void EditorFileServer::_subthread_start(void*s) {
ClientData *cd = (ClientData*)s;
void EditorFileServer::_subthread_start(void *s) {
ClientData *cd = (ClientData *)s;
cd->connection->set_nodelay(true);
uint8_t buf4[8];
Error err = cd->connection->get_data(buf4,4);
if (err!=OK) {
Error err = cd->connection->get_data(buf4, 4);
if (err != OK) {
_close_client(cd);
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
}
int passlen = decode_uint32(buf4);
int passlen=decode_uint32(buf4);
if (passlen>512) {
if (passlen > 512) {
_close_client(cd);
ERR_FAIL_COND(passlen>512);
} else if (passlen>0) {
ERR_FAIL_COND(passlen > 512);
} else if (passlen > 0) {
Vector<char> passutf8;
passutf8.resize(passlen+1);
err = cd->connection->get_data((uint8_t*)passutf8.ptr(),passlen);
if (err!=OK) {
passutf8.resize(passlen + 1);
err = cd->connection->get_data((uint8_t *)passutf8.ptr(), passlen);
if (err != OK) {
_close_client(cd);
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
}
passutf8[passlen]=0;
passutf8[passlen] = 0;
String s;
s.parse_utf8(passutf8.ptr());
if (s!=cd->efs->password) {
encode_uint32(ERR_INVALID_DATA,buf4);
cd->connection->put_data(buf4,4);
if (s != cd->efs->password) {
encode_uint32(ERR_INVALID_DATA, buf4);
cd->connection->put_data(buf4, 4);
OS::get_singleton()->delay_usec(1000000);
_close_client(cd);
ERR_PRINT("CLIENT PASSWORD MISMATCH");
ERR_FAIL();
}
} else {
if (cd->efs->password!="") {
encode_uint32(ERR_INVALID_DATA,buf4);
cd->connection->put_data(buf4,4);
if (cd->efs->password != "") {
encode_uint32(ERR_INVALID_DATA, buf4);
cd->connection->put_data(buf4, 4);
OS::get_singleton()->delay_usec(1000000);
_close_client(cd);
ERR_PRINT("CLIENT PASSWORD MISMATCH (should be empty!)");
@ -103,163 +99,161 @@ void EditorFileServer::_subthread_start(void*s) {
}
}
encode_uint32(OK,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(OK, buf4);
cd->connection->put_data(buf4, 4);
while(!cd->quit) {
while (!cd->quit) {
//wait for ID
err = cd->connection->get_data(buf4,4);
err = cd->connection->get_data(buf4, 4);
//#define DEBUG_PRINT(m_p) print_line(m_p)
DEBUG_TIME("get_data")
if (err!=OK) {
if (err != OK) {
_close_client(cd);
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
}
int id=decode_uint32(buf4);
int id = decode_uint32(buf4);
//wait for command
err = cd->connection->get_data(buf4,4);
if (err!=OK) {
err = cd->connection->get_data(buf4, 4);
if (err != OK) {
_close_client(cd);
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
}
int cmd=decode_uint32(buf4);
int cmd = decode_uint32(buf4);
switch(cmd) {
switch (cmd) {
case FileAccessNetwork::COMMAND_FILE_EXISTS:
case FileAccessNetwork::COMMAND_GET_MODTIME:
case FileAccessNetwork::COMMAND_OPEN_FILE: {
DEBUG_TIME("open_file")
err = cd->connection->get_data(buf4,4);
if (err!=OK) {
err = cd->connection->get_data(buf4, 4);
if (err != OK) {
_close_client(cd);
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
}
int namelen=decode_uint32(buf4);
int namelen = decode_uint32(buf4);
Vector<char> fileutf8;
fileutf8.resize(namelen+1);
err = cd->connection->get_data((uint8_t*)fileutf8.ptr(),namelen);
if (err!=OK) {
fileutf8.resize(namelen + 1);
err = cd->connection->get_data((uint8_t *)fileutf8.ptr(), namelen);
if (err != OK) {
_close_client(cd);
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
}
fileutf8[namelen]=0;
fileutf8[namelen] = 0;
String s;
s.parse_utf8(fileutf8.ptr());
if (cmd==FileAccessNetwork::COMMAND_FILE_EXISTS) {
print_line("FILE EXISTS: "+s);
if (cmd == FileAccessNetwork::COMMAND_FILE_EXISTS) {
print_line("FILE EXISTS: " + s);
}
if (cmd==FileAccessNetwork::COMMAND_GET_MODTIME) {
print_line("MOD TIME: "+s);
if (cmd == FileAccessNetwork::COMMAND_GET_MODTIME) {
print_line("MOD TIME: " + s);
}
if (cmd==FileAccessNetwork::COMMAND_OPEN_FILE) {
print_line("OPEN: "+s);
if (cmd == FileAccessNetwork::COMMAND_OPEN_FILE) {
print_line("OPEN: " + s);
}
if ( !s.begins_with("res://")) {
if (!s.begins_with("res://")) {
_close_client(cd);
ERR_FAIL_COND(!s.begins_with("res://"));
}
ERR_CONTINUE(cd->files.has(id));
if (cmd==FileAccessNetwork::COMMAND_FILE_EXISTS) {
if (cmd == FileAccessNetwork::COMMAND_FILE_EXISTS) {
encode_uint32(id,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(FileAccessNetwork::RESPONSE_FILE_EXISTS,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(FileAccess::exists(s),buf4);
cd->connection->put_data(buf4,4);
encode_uint32(id, buf4);
cd->connection->put_data(buf4, 4);
encode_uint32(FileAccessNetwork::RESPONSE_FILE_EXISTS, buf4);
cd->connection->put_data(buf4, 4);
encode_uint32(FileAccess::exists(s), buf4);
cd->connection->put_data(buf4, 4);
DEBUG_TIME("open_file_end")
break;
}
if (cmd==FileAccessNetwork::COMMAND_GET_MODTIME) {
if (cmd == FileAccessNetwork::COMMAND_GET_MODTIME) {
encode_uint32(id,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(FileAccessNetwork::RESPONSE_GET_MODTIME,buf4);
cd->connection->put_data(buf4,4);
encode_uint64(FileAccess::get_modified_time(s),buf4);
cd->connection->put_data(buf4,8);
encode_uint32(id, buf4);
cd->connection->put_data(buf4, 4);
encode_uint32(FileAccessNetwork::RESPONSE_GET_MODTIME, buf4);
cd->connection->put_data(buf4, 4);
encode_uint64(FileAccess::get_modified_time(s), buf4);
cd->connection->put_data(buf4, 8);
DEBUG_TIME("open_file_end")
break;
}
FileAccess *fa = FileAccess::open(s,FileAccess::READ);
FileAccess *fa = FileAccess::open(s, FileAccess::READ);
if (!fa) {
//not found, continue
encode_uint32(id,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(FileAccessNetwork::RESPONSE_OPEN,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(ERR_FILE_NOT_FOUND,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(id, buf4);
cd->connection->put_data(buf4, 4);
encode_uint32(FileAccessNetwork::RESPONSE_OPEN, buf4);
cd->connection->put_data(buf4, 4);
encode_uint32(ERR_FILE_NOT_FOUND, buf4);
cd->connection->put_data(buf4, 4);
DEBUG_TIME("open_file_end")
break;
}
encode_uint32(id,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(FileAccessNetwork::RESPONSE_OPEN,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(OK,buf4);
cd->connection->put_data(buf4,4);
encode_uint64(fa->get_len(),buf4);
cd->connection->put_data(buf4,8);
encode_uint32(id, buf4);
cd->connection->put_data(buf4, 4);
encode_uint32(FileAccessNetwork::RESPONSE_OPEN, buf4);
cd->connection->put_data(buf4, 4);
encode_uint32(OK, buf4);
cd->connection->put_data(buf4, 4);
encode_uint64(fa->get_len(), buf4);
cd->connection->put_data(buf4, 8);
cd->files[id]=fa;
cd->files[id] = fa;
DEBUG_TIME("open_file_end")
} break;
case FileAccessNetwork::COMMAND_READ_BLOCK: {
err = cd->connection->get_data(buf4,8);
if (err!=OK) {
err = cd->connection->get_data(buf4, 8);
if (err != OK) {
_close_client(cd);
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
}
ERR_CONTINUE(!cd->files.has(id));
uint64_t offset = decode_uint64(buf4);
err = cd->connection->get_data(buf4,4);
if (err!=OK) {
err = cd->connection->get_data(buf4, 4);
if (err != OK) {
_close_client(cd);
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
}
int blocklen=decode_uint32(buf4);
ERR_CONTINUE(blocklen > (16*1024*1024));
int blocklen = decode_uint32(buf4);
ERR_CONTINUE(blocklen > (16 * 1024 * 1024));
cd->files[id]->seek(offset);
Vector<uint8_t> buf;
buf.resize(blocklen);
int read = cd->files[id]->get_buffer(buf.ptr(),blocklen);
ERR_CONTINUE(read<0);
int read = cd->files[id]->get_buffer(buf.ptr(), blocklen);
ERR_CONTINUE(read < 0);
print_line("GET BLOCK - offset: "+itos(offset)+", blocklen: "+itos(blocklen));
print_line("GET BLOCK - offset: " + itos(offset) + ", blocklen: " + itos(blocklen));
//not found, continue
encode_uint32(id,buf4);
cd->connection->put_data(buf4,4);
encode_uint32(FileAccessNetwork::RESPONSE_DATA,buf4);
cd->connection->put_data(buf4,4);
encode_uint64(offset,buf4);
cd->connection->put_data(buf4,8);
encode_uint32(read,buf4);
cd->connection->put_data(buf4,4);
cd->connection->put_data(buf.ptr(),read);
encode_uint32(id, buf4);
cd->connection->put_data(buf4, 4);
encode_uint32(FileAccessNetwork::RESPONSE_DATA, buf4);
cd->connection->put_data(buf4, 4);
encode_uint64(offset, buf4);
cd->connection->put_data(buf4, 8);
encode_uint32(read, buf4);
cd->connection->put_data(buf4, 4);
cd->connection->put_data(buf.ptr(), read);
} break;
case FileAccessNetwork::COMMAND_CLOSE: {
@ -273,31 +267,30 @@ void EditorFileServer::_subthread_start(void*s) {
}
_close_client(cd);
}
void EditorFileServer::_thread_start(void*s) {
void EditorFileServer::_thread_start(void *s) {
EditorFileServer *self=(EditorFileServer*)s;
while(!self->quit) {
EditorFileServer *self = (EditorFileServer *)s;
while (!self->quit) {
if (self->cmd==CMD_ACTIVATE) {
if (self->cmd == CMD_ACTIVATE) {
self->server->listen(self->port);
self->active=true;
self->cmd=CMD_NONE;
} else if (self->cmd==CMD_STOP) {
self->active = true;
self->cmd = CMD_NONE;
} else if (self->cmd == CMD_STOP) {
self->server->stop();
self->active=false;
self->cmd=CMD_NONE;
self->active = false;
self->cmd = CMD_NONE;
}
if (self->active) {
if (self->server->is_connection_available()) {
ClientData *cd = memnew( ClientData);
cd->connection=self->server->take_connection();
cd->efs=self;
cd->quit=false;
cd->thread=Thread::create(_subthread_start,cd);
ClientData *cd = memnew(ClientData);
cd->connection = self->server->take_connection();
cd->efs = self;
cd->quit = false;
cd->thread = Thread::create(_subthread_start, cd);
}
}
@ -314,18 +307,14 @@ void EditorFileServer::_thread_start(void*s) {
OS::get_singleton()->delay_usec(100000);
}
}
void EditorFileServer::start() {
stop();
port=EDITOR_DEF("filesystem/file_server/port",6010);
password=EDITOR_DEF("filesystem/file_server/password","");
cmd=CMD_ACTIVATE;
port = EDITOR_DEF("filesystem/file_server/port", 6010);
password = EDITOR_DEF("filesystem/file_server/password", "");
cmd = CMD_ACTIVATE;
}
bool EditorFileServer::is_active() const {
@ -333,28 +322,27 @@ bool EditorFileServer::is_active() const {
return active;
}
void EditorFileServer::stop(){
void EditorFileServer::stop() {
cmd=CMD_STOP;
cmd = CMD_STOP;
}
EditorFileServer::EditorFileServer() {
server = TCP_Server::create_ref();
wait_mutex = Mutex::create();
quit=false;
active=false;
cmd=CMD_NONE;
thread=Thread::create(_thread_start,this);
quit = false;
active = false;
cmd = CMD_NONE;
thread = Thread::create(_thread_start, this);
EDITOR_DEF("filesystem/file_server/port",6010);
EDITOR_DEF("filesystem/file_server/password","");
EDITOR_DEF("filesystem/file_server/port", 6010);
EDITOR_DEF("filesystem/file_server/password", "");
}
EditorFileServer::~EditorFileServer() {
quit=true;
quit = true;
Thread::wait_to_finish(thread);
memdelete(thread);
memdelete(wait_mutex);

20
editor/fileserver/editor_file_server.h
View File

@ -29,15 +29,15 @@
#ifndef EDITOR_FILE_SERVER_H
#define EDITOR_FILE_SERVER_H
#include "io/file_access_network.h"
#include "io/packet_peer.h"
#include "io/tcp_server.h"
#include "object.h"
#include "os/thread.h"
#include "io/tcp_server.h"
#include "io/packet_peer.h"
#include "io/file_access_network.h"
class EditorFileServer : public Object {
GDCLASS(EditorFileServer,Object);
GDCLASS(EditorFileServer, Object);
enum Command {
CMD_NONE,
@ -45,26 +45,24 @@ class EditorFileServer : public Object {
CMD_STOP,
};
struct ClientData {
Thread *thread;
Ref<StreamPeerTCP> connection;
Map<int,FileAccess*> files;
Map<int, FileAccess *> files;
EditorFileServer *efs;
bool quit;
};
Ref<TCP_Server> server;
Set<Thread*> to_wait;
Set<Thread *> to_wait;
static void _close_client(ClientData *cd);
static void _subthread_start(void*s);
static void _subthread_start(void *s);
Mutex *wait_mutex;
Thread *thread;
static void _thread_start(void*);
static void _thread_start(void *);
bool quit;
Command cmd;
@ -72,9 +70,7 @@ class EditorFileServer : public Object {
int port;
bool active;
public:
void start();
void stop();