From: rtrimana <rtrimana@uci.edu>
Date: Tue, 12 Jul 2016 15:14:53 +0000 (-0700)
Subject: Adding helper functions for server part; cleaning up
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3f22f574c93b26bcb530ee415b9326d70c1c167b;p=iotcloud.git

Adding helper functions for server part; cleaning up
---

diff --git a/doc/iotcloud.tex b/doc/iotcloud.tex
index 5cf8b64..7952545 100644
--- a/doc/iotcloud.tex
+++ b/doc/iotcloud.tex
@@ -52,7 +52,7 @@ client's last entry from the queue. This is kept in the slot until
 the entry owner inserts a newer update into the queue.}
 \item Queue state entry: Includes queue size \newline {The purpose 
 of this is for the client to tell if the server lies about the number 
-of slots in the queue, e.g. if there are 2 queue state entry in the queue, 
+of slots in the queue, e.g. if there are 2 queue state entries in the queue, 
 e.g. 50 and 70, the client knows that when it sees 50, it should expect 
 at most 50 slots in the queue and after it sees 70, it should expect 
 50 slots before that queue state entry slot 50 and at most 70 slots. 
@@ -132,7 +132,14 @@ $slot_s = \tuple{s, sv} \in SL \subseteq SN \times SV$ \\
 \textbf{State} \\
 \textit{SL = set of live slots on server} \\
 \textit{max = maximum number of slots (input only for resize message)} \\
-\textit{n = number of slots} \\
+\textit{n = number of slots} \\ \\
+\textbf{Helper Function} \\
+$MaxSlot(SL')= \langle s, sv \rangle \mid \langle s, sv \rangle 
+\in SL' \wedge \forall \langle s', sv' \rangle \in SL', s \geq s'$ \\
+$MinSlot(SL')= \langle s, sv \rangle \mid \langle s, sv \rangle 
+\in SL' \wedge \forall \langle s', sv' \rangle \in SL', s \leq s'$ \\
+$SeqN(\langle s, sv \rangle)=s$ \\
+$SlotVal(\langle s, sv \rangle)=sv$ \\
 
 \begin{algorithmic}[1]
 \Function{GetSlot}{$s_g$}
@@ -145,12 +152,12 @@ $slot_s = \tuple{s, sv} \in SL \subseteq SN \times SV$ \\
 \If{$(max' \neq \emptyset)$}\Comment{Resize}
 \State $max \gets max'$
 \EndIf
-\State $s_n \gets \{\langle s,sv \rangle \in SL \mid 
-    \forall \langle s_i,sv_i \rangle \in SL, s \geq s_i\}$\Comment{Last s}
+\State $\langle s_n,sv_n \rangle \gets MaxSlot(SL)$\Comment{Last sv}
+\State $s_n \gets SeqN(\langle s_n,sv_n \rangle)$
 \If{$(s_p = s_n + 1)$}
 	\If{$n = max$}
-		\State $SL \gets SL - \{\langle s,sv \rangle \in SL \mid 
-    \forall \langle s_i,sv_i \rangle \in SL, s \leq s_i\}$\Comment{First s}
+    	\State $\langle s_m,sv_m \rangle \gets MinSlot(SL)$\Comment{First sv}
+		\State $SL \gets SL - \{\langle s_m,sv_m \rangle\}$
 	\Else \Comment{$n < max$}
 		\State $n \gets n + 1$
 	\EndIf