From 56503eabd95876aff0f7a0595e1f30189c41c816 Mon Sep 17 00:00:00 2001
From: niklas <niklas@niklas-Orion.(none)>
Date: Mon, 2 May 2011 16:48:35 +0200
Subject: [PATCH 1/2] Merge!

---
 report.lyx | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/report.lyx b/report.lyx
index f50a62d..5d9c0ce 100644
--- a/report.lyx
+++ b/report.lyx
@@ -1,5 +1,10 @@
+<<<<<<< Updated upstream
 #LyX 2.0 created this file. For more info see http://www.lyx.org/
 \lyxformat 413
+=======
+#LyX 1.6.7 created this file. For more info see http://www.lyx.org/
+\lyxformat 345
+>>>>>>> Stashed changes
 \begin_document
 \begin_header
 \textclass report
@@ -507,6 +512,7 @@ Citation needed
 \end_inset
 
  The existing game servers are functional but they lack good fault tolerance
+<<<<<<< Updated upstream
  and the ability to scale well
 \begin_inset Note Note
 status open
@@ -519,6 +525,10 @@ Citation needed
 
 .
  Users will notice this in low uptime and many crashes.
+=======
+ and the ability to scale well.
+ Users will githubnotice this in low uptime and many crashes.
+>>>>>>> Stashed changes
  This is a problem that has existed and been resolved in other industries.
  In the telecom industry solutins to similar problems have been found.
 \end_layout
@@ -3729,6 +3739,16 @@ The parser of the GGS protocol implemented in the GGS prototype is designed
  from the protocol paser using message passing.
 \end_layout
 
+\begin_layout Standard
+Load balancing can often be implemented using dedicated software, this means
+ that in many applications load balancing may not be implemented because
+ it already exist functional solutions.
+ This depends on what specific needs the system have and a minor goal of
+ the project is to analyze whether the GGS project can use existing load
+ balancing tools or if it is necessary to implement load balancing in the
+ project.
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Note
 status open
@@ -4911,6 +4931,10 @@ The project has not followed any specific software development methodology.
 Statistics
 \end_layout
 
+\begin_layout Standard
+
+\end_layout
+
 \begin_layout Section
 Future improvements
 \end_layout

From 7e0ce7bf3c926e5fa0e029d929e286136d874c8c Mon Sep 17 00:00:00 2001
From: niklas <niklas@niklas-Orion.(none)>
Date: Tue, 3 May 2011 13:29:53 +0200
Subject: [PATCH 2/2] Added content about load balancing and statistics

---
 report.lyx | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/report.lyx b/report.lyx
index 4e66f3f..8627515 100644
--- a/report.lyx
+++ b/report.lyx
@@ -2284,6 +2284,16 @@ Load balancing is a key component to achieve scalability in network systems.
  and implemented.
 \end_layout
 
+\begin_layout Standard
+Load balancing can often be implemented using dedicated software, this means
+ that in many applications load balancing may not be implemented because
+ it already exist functional solutions.
+ This depends on what specific needs the system have and a minor goal of
+ the project is to analyze whether the GGS project can use existing load
+ balancing tools or if it is necessary to implement load balancing in the
+ project.
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Note
 status open
@@ -5073,6 +5083,29 @@ ng.
 Statistics
 \end_layout
 
+\begin_layout Standard
+Important things to note are that the number of clients is not a good way
+ of measuring the performance of the server because the server is possible
+ to have a large number of clients on the server but it can not handle all
+ the information.
+ Instead the performance of the server should be measured in the number
+ of messages it can handle per second.
+\end_layout
+
+\begin_layout Standard
+We were able to reach 6000 messages per second on the server, which corresponds
+ to around 350 clients.
+ However soon after this mnesia printed some warnings and the clients started
+ to lag.
+ With this in mind one thing to investigate is if mnesia is the bottleneck
+ in the system.
+ Current game servers do not use databases to save their state and maybe
+ we can see the reason here.
+ Other possible bottlenecks may be the protocol, but this seems less likely
+ than mnesia.
+ 
+\end_layout
+
 \begin_layout Standard
 \begin_inset Float figure
 wide false
@@ -5255,4 +5288,3 @@ options "plainnat"
 
 \end_body
 \end_document
-