Changeset 5b84a321

Timestamp:

Apr 19, 2022, 3:13:27 PM (2 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

2686bc7, 3c79ea9

Parents:

2e9b59b

Message:

resolved allocator.text conflict

File:

• doc/theses/mubeen_zulfiqar_MMath/allocator.tex (modified) (5 diffs)

doc/theses/mubeen_zulfiqar_MMath/allocator.tex

@@ -24 +24 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-<<<<<<< HEAD
-\section{Design choices for uHeap}\label{sec:allocatorSec}
-uHeap's design was reviewed and changed to fulfill new requirements (FIX ME: cite allocator philosophy). For this purpose, following two designs of uHeapLmm were proposed:
-=======
 \section{Design Choices}
->>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
 
 llheap's design was reviewed and changed multiple times throughout the thesis.
@@ -253 +248 @@
 \begin{figure}
 \centering
-<<<<<<< HEAD
-\includegraphics[width=0.65\textwidth]{figures/NewHeapStructure.eps}
-\caption{uHeap Structure}
-\label{fig:heapStructureFig}
-=======
 % \includegraphics[width=0.65\textwidth]{figures/NewHeapStructure.eps}
 \input{llheap}
 \caption{llheap Structure}
 \label{f:llheapStructure}
->>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
 \end{figure}
 
@@ -342 +331 @@
 \end{algorithm}
 
-<<<<<<< HEAD
-Algorithm~\ref{alg:heapObjectFreeOwn} shows how a free request is fulfilled if object ownership is turned on. Algorithm~\ref{alg:heapObjectFreeNoOwn} shows how the same free request is fulfilled without object ownership.
-
-\begin{algorithm}
-\caption{Dynamic object free at address A with object ownership}\label{alg:heapObjectFreeOwn}
-\begin{algorithmic}[1]
-\If {$\textit{A was mmap-ed}$}
-        \State $\text{return A's dynamic memory to system using system call munmap}$
-=======
 \vspace*{-15pt}
 \begin{algorithm}[H]
@@ -358 +338 @@
 \If {$\textit{A mapped allocation}$}
         \State $\text{return A's dynamic memory to system using system call \lstinline{munmap}}$
->>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
 \Else
         \State $\text{B} \gets \textit{O's owner}$
@@ -369 +348 @@
 \end{algorithmic}
 \end{algorithm}
-<<<<<<< HEAD
-
-\begin{algorithm}
-\caption{Dynamic object free at address A without object ownership}\label{alg:heapObjectFreeNoOwn}
-\begin{algorithmic}[1]
-\If {$\textit{A was mmap-ed}$}
-        \State $\text{return A's dynamic memory to system using system call munmap}$
-\Else
-        \State $\text{B} \gets \textit{O's owner}$
-        \If {$\textit{B is thread-local heap's bucket}$}
-                \State $\text{push A to B's free-list}$
-        \Else
-                \State $\text{C} \gets \textit{thread local heap's bucket with same size as B}$
-                \State $\text{push A to C's free-list}$
-        \EndIf
-\EndIf
-\end{algorithmic}
-\end{algorithm}
-
-=======
->>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
 
 \vspace*{-15pt}