0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed gamelist diff calculations to be O(1) instead of O(n)...

Browse source 
...(merged 2008-03-12T04:59:47Z!davewx7@gmail.com)

optimized networking code to elide unnecessary copy of outgoing config
objects (merged 2008-03-12T06:21:57Z!davewx7@gmail.com)
This commit is contained in:
Gunter Labes 2008-03-12 15:14:54 +00:00
parent ba65d275d2
commit 4c1ef50b4b
4 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/config.cpp
View file

@ -429,7 +429,12 @@ config::all_children_iterator config::ordered_end() const
config config::get_diff(const config& c) const
{
config res;
get_diff(c, res);
return res;
}
void config::get_diff(const config& c, config& res) const
{
config* inserts = NULL;
string_map::const_iterator i;
@ -530,9 +535,6 @@ config config::get_diff(const config& c) const
}
}
}
return res;
}
void config::apply_diff(const config& diff)

1
src/config.hpp
View file

@ -145,6 +145,7 @@ public:
//! I.e. calling cfg2.apply_diff(cfg1.get_diff(cfg2))
//! will make cfg1 identical to cfg2.
config get_diff(const config& c) const;
void get_diff(const config& c, config& res) const;
void apply_diff(const config& diff); //throw error

27
src/network_worker.cpp
View file

@ -115,6 +115,7 @@ struct buffer {
TCPsocket sock;
mutable config config_buf;
std::string config_error;
std::ostringstream stream;
//! Do we wish to send the data gzipped, if not use binary wml.
//! This needs to stay until the last user of binary_wml has
//! been removed.
@ -250,25 +251,27 @@ bool receive_with_timeout(TCPsocket s, char* buf, size_t nbytes,
return true;
}
static SOCKET_STATE send_buffer(TCPsocket sock, config& config_in, const bool gzipped) {
#ifdef __BEOS__
int timeout = 15000;
#endif
size_t upto = 0;
std::ostringstream compressor;
static void output_to_buffer(TCPsocket sock, const config& cfg, std::ostringstream& compressor, bool gzipped)
{
if(gzipped) {
// std::cerr << "send gzipped\n.";
config_writer writer(compressor, true, "");
writer.write(config_in);
writer.write(cfg);
} else {
compression_schema *compress;
// std::cerr << "send binary wml\n.";
{
const threading::lock lock(*schemas_mutex);
compress = &schemas.insert(std::pair<TCPsocket,schema_pair>(sock,schema_pair())).first->second.outgoing;
}
write_compressed(compressor, config_in, *compress);
write_compressed(compressor, cfg, *compress);
}
}
static SOCKET_STATE send_buffer(TCPsocket sock, std::ostringstream& compressor, const bool gzipped) {
#ifdef __BEOS__
int timeout = 15000;
#endif
size_t upto = 0;
std::string const &value = compressor.str();
std::vector<char> buf(4 + value.size() + 1);
SDLNet_Write32(value.size()+1,&buf[0]);
@ -488,7 +491,7 @@ static int process_queue(void* shard_num)
std::vector<char> buf;
if(sent_buf) {
result = send_buffer(sent_buf->sock, sent_buf->config_buf, sent_buf->gzipped);
result = send_buffer(sent_buf->sock, sent_buf->stream, sent_buf->gzipped);
delete sent_buf;
} else {
result = receive_buf(sock,buf);
@ -655,7 +658,7 @@ void queue_data(TCPsocket sock,const config& buf, const bool gzipped)
DBG_NW << "queuing data...\n";
buffer* queued_buf = new buffer(sock);
queued_buf->config_buf = buf;
output_to_buffer(sock, buf, queued_buf->stream, gzipped);
queued_buf->gzipped = gzipped;
{
const int shard = get_shard(sock);

5
src/server/server.cpp
View file

@ -276,8 +276,9 @@ bool server::is_ip_banned(const std::string& ip) const {
config server::games_and_users_list_diff() {
config res;
res.add_child("gamelist_diff",games_and_users_list_.get_diff(old_games_and_users_list_));
old_games_and_users_list_ = games_and_users_list_;
config& diff = res.add_child("gamelist_diff");
games_and_users_list_.get_diff(old_games_and_users_list_, diff);
old_games_and_users_list_.apply_diff(diff);
return res;
}