Ignore:
Timestamp:
Apr 19, 2022, 3:13:27 PM (22 months ago)
Author:
m3zulfiq <m3zulfiq@…>
Branches:
ADT, ast-experimental, master, pthread-emulation, qualifiedEnum
Children:
2686bc7, 3c79ea9
Parents:
2e9b59b
Message:

resolved allocator.text conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/theses/mubeen_zulfiqar_MMath/allocator.tex

    r2e9b59b r5b84a321  
    2424%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    2525
    26 <<<<<<< HEAD
    27 \section{Design choices for uHeap}\label{sec:allocatorSec}
    28 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:
    29 =======
    3026\section{Design Choices}
    31 >>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
    3227
    3328llheap's design was reviewed and changed multiple times throughout the thesis.
     
    253248\begin{figure}
    254249\centering
    255 <<<<<<< HEAD
    256 \includegraphics[width=0.65\textwidth]{figures/NewHeapStructure.eps}
    257 \caption{uHeap Structure}
    258 \label{fig:heapStructureFig}
    259 =======
    260250% \includegraphics[width=0.65\textwidth]{figures/NewHeapStructure.eps}
    261251\input{llheap}
    262252\caption{llheap Structure}
    263253\label{f:llheapStructure}
    264 >>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
    265254\end{figure}
    266255
     
    342331\end{algorithm}
    343332
    344 <<<<<<< HEAD
    345 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.
    346 
    347 \begin{algorithm}
    348 \caption{Dynamic object free at address A with object ownership}\label{alg:heapObjectFreeOwn}
    349 \begin{algorithmic}[1]
    350 \If {$\textit{A was mmap-ed}$}
    351         \State $\text{return A's dynamic memory to system using system call munmap}$
    352 =======
    353333\vspace*{-15pt}
    354334\begin{algorithm}[H]
     
    358338\If {$\textit{A mapped allocation}$}
    359339        \State $\text{return A's dynamic memory to system using system call \lstinline{munmap}}$
    360 >>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
    361340\Else
    362341        \State $\text{B} \gets \textit{O's owner}$
     
    369348\end{algorithmic}
    370349\end{algorithm}
    371 <<<<<<< HEAD
    372 
    373 \begin{algorithm}
    374 \caption{Dynamic object free at address A without object ownership}\label{alg:heapObjectFreeNoOwn}
    375 \begin{algorithmic}[1]
    376 \If {$\textit{A was mmap-ed}$}
    377         \State $\text{return A's dynamic memory to system using system call munmap}$
    378 \Else
    379         \State $\text{B} \gets \textit{O's owner}$
    380         \If {$\textit{B is thread-local heap's bucket}$}
    381                 \State $\text{push A to B's free-list}$
    382         \Else
    383                 \State $\text{C} \gets \textit{thread local heap's bucket with same size as B}$
    384                 \State $\text{push A to C's free-list}$
    385         \EndIf
    386 \EndIf
    387 \end{algorithmic}
    388 \end{algorithm}
    389 
    390 =======
    391 >>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
    392350
    393351\vspace*{-15pt}
Note: See TracChangeset for help on using the changeset viewer.