Index: doc/LaTeXmacros/common.sty =================================================================== --- doc/LaTeXmacros/common.sty (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ doc/LaTeXmacros/common.sty (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,316 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*- Mode: Latex -*- %%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +%% +%% The contents of this file are covered under the licence agreement in the +%% file "LICENCE" distributed with Cforall. +%% +%% common.tex -- +%% +%% Author : Peter A. Buhr +%% Created On : Sat Apr 9 10:06:17 2016 +%% Last Modified By : Peter A. Buhr +%% Last Modified On : Sat May 8 08:48:35 2021 +%% Update Count : 550 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\setlength{\textheight}{9in} +%\oddsidemargin 0.0in +\renewcommand{\topfraction}{0.8} % float must be greater than X of the page before it is forced onto its own page +\renewcommand{\bottomfraction}{0.8} % float must be greater than X of the page before it is forced onto its own page +\renewcommand{\floatpagefraction}{0.8} % float must be greater than X of the page before it is forced onto its own page +\renewcommand{\textfraction}{0.0} % the entire page maybe devoted to floats with no text on the page at all + +\lefthyphenmin=4 % hyphen only after 4 characters +\righthyphenmin=4 + +\usepackage[ignoredisplayed]{enumitem} % do not affect trivlist +\setlist{labelsep=1ex}% global +\setlist[itemize]{topsep=0.5ex,parsep=0.25ex,itemsep=0.25ex,listparindent=\parindent,leftmargin=\parindent}% global +\setlist[itemize,1]{label=\textbullet}% local +%\renewcommand{\labelitemi}{{\raisebox{0.25ex}{\footnotesize$\bullet$}}} +\setlist[enumerate]{listparindent=\parindent}% global +\setlist[enumerate,2]{leftmargin=\parindent,labelsep=*,align=parleft,label=\alph*.}% local +\setlist[description]{topsep=0.5ex,itemsep=0pt,listparindent=\parindent,leftmargin=\parindent,labelsep=1.5ex} + +% Names used in the document. + +\usepackage{xspace} +\newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}} % Cforall icon +\newcommand{\CFA}{\protect\CFAIcon\xspace} % CFA symbolic name +\newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall non-icon name +\newcommand{\Celeven}{\textrm{C11}\xspace} % C11 symbolic name +\newcommand{\CCIcon}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}} % C++ icon +\newcommand{\CC}[1][]{\protect\CCIcon{#1}\xspace} % C++ symbolic name +% numbers disallowed in latex variables names => use number names +\newcommand{\CCeleven}{\protect\CCIcon{11}\xspace} % C++11 symbolic name +\newcommand{\CCfourteen}{\protect\CCIcon{14}\xspace} % C++14 symbolic name +\newcommand{\CCseventeen}{\protect\CCIcon{17}\xspace} % C++17 symbolic name +\newcommand{\CCtwenty}{\protect\CCIcon{20}\xspace} % C++20 symbolic name +\newcommand{\Csharp}{C\raisebox{-0.7ex}{\Large$^\sharp$}\xspace} % C# symbolic name + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% remove special-character warning in PDF side-bar names +\@ifpackageloaded{hyperref}{ + \pdfstringdefDisableCommands{ + \def\CFA{\CFL} + \def\Celeven{C11\xspace} + \def\CC{C++\xspace} + \def\CCeleven{C++11\xspace} + \def\CCfourteen{C++14\xspace} + \def\CCseventeen{C++17\xspace} + \def\CCtwenty{C++20\xspace} + \def\Csharp{C\#\xspace} + \def\lstinline{\xspace}% must use {} as delimiters, e.g., \lstinline{...} + }{} +} + +% parindent is relative, i.e., toggled on/off in environments like itemize, so store the value for +% use rather than use \parident directly. +\newlength{\parindentlnth} +\setlength{\parindentlnth}{\parindent} + +\usepackage{pslatex} % reduce size of san serif font +\usepackage{relsize} % must be after change to small or selects old size +\usepackage{rotating} + +% reduce size of chapter/section titles +\def\@makechapterhead#1{% + \vspace*{50\p@}% + {\parindent \z@ \raggedright \normalfont + \ifnum \c@secnumdepth >\m@ne + \large\bfseries \@chapapp\space \thechapter + \par\nobreak + \vskip 5\p@ + \fi + \interlinepenalty\@M + \Large \bfseries #1\par\nobreak + \vskip 50\p@ + }} +\def\@makeschapterhead#1{% + \vspace*{50\p@}% + {\parindent \z@ \raggedright + \normalfont + \interlinepenalty\@M + \Large \bfseries #1\par\nobreak + \vskip 50\p@ + }} +\renewcommand\section{\@startsection{section}{1}{\z@}{-3.0ex \@plus -1ex \@minus -.2ex}{1.5ex \@plus .2ex}{\normalfont\large\bfseries}} +\renewcommand\subsection{\@startsection{subsection}{2}{\z@}{-2.75ex \@plus -1ex \@minus -.2ex}{1.25ex \@plus .2ex}{\normalfont\normalsize\bfseries}} +\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}{-2.5ex \@plus -1ex \@minus -.2ex}{1.0ex \@plus .2ex}{\normalfont\normalsize\bfseries}} +\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}{-2.0ex \@plus -1ex \@minus -.2ex}{-1em}{\normalfont\normalsize\bfseries}} +\renewcommand\subparagraph{\@startsection{subparagraph}{4}{\z@}{-1.5ex \@plus -1ex \@minus -.2ex}{-1em}{\normalfont\normalsize\bfseries\itshape}} + +% index macros +\newcommand{\italic}[1]{\emph{\hyperpage{#1}}} +\newcommand{\Definition}[1]{\textbf{\hyperpage{#1}}} +\newcommand{\see}[1]{(see #1)} + +% Define some commands that produce formatted index entries suitable for cross-references. +% ``\spec'' produces entries for specifications of entities. ``\impl'' produces entries for their +% implementations, and ``\use'' for their uses. + +% \newcommand{\bold}[1]{{\bf #1}} +% \def\spec{\@bsphack\begingroup +% \def\protect##1{\string##1\space}\@sanitize +% \@wrxref{|bold}} +\def\impl{\@bsphack\begingroup + \def\protect##1{\string##1\space}\@sanitize + \@wrxref{|Definition}} +\newcommand{\indexcode}[1]{{\lstinline$#1$}} +\def\use{\@bsphack\begingroup + \def\protect##1{\string##1\space}\@sanitize + \@wrxref{|hyperpage}} +\def\@wrxref#1#2{\let\thepage\relax + \xdef\@gtempa{\write\@indexfile{\string + \indexentry{#2@{\lstinline$#2$}#1}{\thepage}}}\endgroup\@gtempa + \if@nobreak \ifvmode\nobreak\fi\fi\@esphack} +%\newcommand{\use}[1]{\index{#1@{\lstinline$#1$}}} +%\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|Definition}} + +% inline text and lowercase index: \Index{inline and lowercase index text} +\newcommand{\Index}{\@ifstar\@sIndex\@Index} +% inline text and as-in index: \Index[as-is index text]{inline text} +\newcommand{\@Index}[2][\@empty]{\lowercase{\def\temp{#2}}#2\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi} +% inline text but index with different as-is text: \Index[index text]{inline text} +\newcommand{\@sIndex}[2][\@empty]{#2\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi} + +% inline text and code index (cannot use ©) +\newcommand{\Indexc}[2][\@empty]{\lstinline[#1]$#2$\index{#2@\lstinline[#1]$#2$}} +% code index (cannot use ©) +\newcommand{\indexc}[2][\@empty]{\index{#2@\lstinline[#1]$#2$}} + +% Denote newterms in particular font and index them without particular font and in lowercase, e.g., \newterm{abc}. +% The option parameter provides an index term different from the new term, e.g., \newterm[\texttt{abc}]{abc} +% The star version does not lowercase the index information, e.g., \newterm*{IBM}. +\newcommand{\newtermFontInline}{\emph} +\newcommand{\newterm}{\protect\@ifstar\@snewterm\@newterm} +\newcommand{\@newterm}[2][\@empty]{\lowercase{\def\temp{#2}}{\newtermFontInline{#2}}\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi} +\newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi} + +% Latin abbreviation +\newcommand{\abbrevFont}{\textit} % set empty for no italics +% If not followed by a comma or colon, add a comma. +\newcommand{\CheckCommaColon}{\@ifnextchar{,}{}{\@ifnextchar{:}{}{,\xspace}}} +% If not followed by a period, add a period. +\newcommand{\CheckPeriod}{\@ifnextchar{.}{}{.\xspace}} + +\@ifundefined{eg}{ +\newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.} +\newcommand{\eg}{\EG\CheckCommaColon} +}{}% +\@ifundefined{ie}{ +\newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.} +\newcommand{\ie}{\IE\CheckCommaColon} +}{}% +\@ifundefined{etc}{ +\newcommand{\ETC}{\abbrevFont{etc}} +\newcommand{\etc}{\ETC\CheckPeriod} +}{}% +\@ifundefined{etal}{ +\newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}} +\newcommand{\etal}{\ETAL\CheckPeriod} +}{}% +\@ifundefined{viz}{ +\newcommand{\VIZ}{\abbrevFont{viz}} +\newcommand{\viz}{\VIZ\CheckPeriod} +}{}% + +\newenvironment{cquote}{% + \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}% + \item\relax +}{% + \endlist +}% cquote + +\newenvironment{rationale}{% + \begin{cquote}\noindent$\Box$\enspace +}{% + \hfill\enspace$\Box$\end{cquote} +}% + +% blocks and titles +\newcommand{\define}[1]{\emph{#1\/}\index{#1}} +\newcommand{\rewriterules}{\paragraph{Rewrite Rules}~\par\noindent} +\newcommand{\examples}{\paragraph{Examples}~\par\noindent} +\newcommand{\semantics}{\paragraph{Semantics}~\par\noindent} +\newcommand{\constraints}{\paragraph{Constraints}~\par\noindent} +\newcommand{\predefined}{\paragraph{Predefined Identifiers}~\par\noindent} + +% BNF macros +\newenvironment{syntax}{ +\paragraph{Syntax} +\begin{cquote} +\begin{description}[noitemsep,leftmargin=\parindentlnth] +}{ +\end{description} +\end{cquote} +} +% \def\syntax{\paragraph{Syntax}\trivlist\parindent=.5in\item[\hskip.5in]} +%\let\endsyntax=\endtrivlist +\newcommand{\lhs}[1]{\item[\emph{#1:}\index{#1@{\emph{#1}}|italic}]~\ignorespaces} +\newcommand{\oldlhs}[1]{\item[\emph{#1:}\index{#1@{\emph{#1}}|italic}~\dots]~} +\newcommand{\rhs}{\hfil\newline} +\newcommand{\nonterm}[1]{\emph{#1}\index{#1@{\emph{#1}}|italic}} +\newcommand{\opt}{$_{opt}$\ } + +\usepackage{varioref} % extended references +% adjust varioref package with default "section" and "page" titles, and optional title with faraway page numbers +% \VRef{label} => Section 2.7, \VPageref{label} => page 17 +% \VRef[Figure]{label} => Figure 3.4, \VPageref{label} => page 17 +\renewcommand{\reftextfaceafter}{\unskip} +\renewcommand{\reftextfacebefore}{\unskip} +\renewcommand{\reftextafter}{\unskip} +\renewcommand{\reftextbefore}{\unskip} +\renewcommand{\reftextfaraway}[1]{\unskip, p.~\pageref{#1}} +\renewcommand{\reftextpagerange}[2]{\unskip, pp.~\pageref{#1}--\pageref{#2}} +\newcommand{\VRef}[2][Section]{\ifx#1\@empty\else{#1}\nobreakspace\fi\vref{#2}} +\newcommand{\VPageref}[2][page]{\ifx#1\@empty\else{#1}\nobreakspace\fi\pageref{#2}} + +\let\Oldthebibliography\thebibliography +\renewcommand\thebibliography[1]{ + \Oldthebibliography{#1} + \setlength{\parskip}{0pt} % reduce vertical spacing between references + \setlength{\itemsep}{5pt plus 0.3ex} +}% + +\usepackage{listings} % format program code +\usepackage{lstlang} +\usepackage{calc} % latex arithmetic + +\newcommand{\LstBasicStyle}[1]{{\lst@basicstyle{#1}}} +\newcommand{\LstKeywordStyle}[1]{{\lst@basicstyle{\lst@keywordstyle{#1}}}} +\newcommand{\LstCommentStyle}[1]{{\lst@basicstyle{\lst@commentstyle{#1}}}} +\newcommand{\LstStringStyle}[1]{{\lst@basicstyle{\lst@stringstyle{#1}}}} + +\newlength{\gcolumnposn} % temporary hack because lstlisting does not handle tabs correctly +\newlength{\columnposn} +\setlength{\gcolumnposn}{2.75in} +\setlength{\columnposn}{\gcolumnposn} +\newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@basicstyle{\LstCommentStyle{#2}}}} +\newcommand{\CRT}{\global\columnposn=\gcolumnposn} + +% allow escape sequence in lstinline +%\usepackage{etoolbox} +%\patchcmd{\lsthk@TextStyle}{\let\lst@DefEsc\@empty}{}{}{\errmessage{failed to patch}} + +% allow adding to lst literate +\def\addToLiterate#1{\protect\edef\lst@literate{\unexpanded\expandafter{\lst@literate}\unexpanded{#1}}} +\lst@Key{add to literate}{}{\addToLiterate{#1}} + +\newcommand{\CFAStyle}{% +\lstset{ +columns=fullflexible, +basicstyle=\linespread{0.9}\sf, % reduce line spacing and use sanserif font +stringstyle=\tt, % use typewriter font +tabsize=5, % N space tabbing +xleftmargin=\parindentlnth, % indent code to paragraph indentation +extendedchars=true, % allow ASCII characters in the range 128-255 +escapechar=\$, % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-' +mathescape=false, % LaTeX math escape in CFA code $...$ +keepspaces=true, % +showstringspaces=false, % do not show spaces with cup +showlines=true, % show blank lines at end of code +aboveskip=4pt, % spacing above/below code block +belowskip=2pt, +numberstyle=\footnotesize\sf, % numbering style +% replace/adjust listing characters that look bad in sanserif +literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.75ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 + {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1 + {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2, +}% lstset +}% CFAStyle + +\ifdefined\CFALatin% extra Latin-1 escape characters +\lstnewenvironment{cfa}[1][]{% necessary +\lstset{ +language=CFA, +%moredelim=**[is][\color{red}]{@}{@}, % red highlighting @...@ +moredelim=**[is][\color{red}]{®}{®}, % red highlighting ®...® (registered trademark symbol) emacs: C-q M-. +%moredelim=**[is][\color{blue}]{ß}{ß}, % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_ +%moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting ¢...¢ (cent symbol) emacs: C-q M-" +%moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^ +}% lstset +\lstset{#1}% necessary +}{} +% inline code ©...© (copyright symbol) emacs: C-q M-) +\lstMakeShortInline© % single-character for \lstinline +\else% regular ASCI characters +\lstnewenvironment{cfa}[1][]{% necessary +\lstset{ +language=CFA, +escapechar=\$, % LaTeX escape in CFA code +mathescape=false, % LaTeX math escape in CFA code $...$ +moredelim=**[is][\color{red}]{@}{@}, % red highlighting @...@ +}% lstset +\lstset{#1}% necessary +}{} +% inline code @...@ (at symbol) +\lstMakeShortInline@ % single-character for \lstinline +\fi% + +% Local Variables: % +% tab-width: 4 % +% fill-column: 100 % +% End: % Index: doc/LaTeXmacros/common.tex =================================================================== --- doc/LaTeXmacros/common.tex (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ doc/LaTeXmacros/common.tex (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -11,6 +11,6 @@ %% Created On : Sat Apr 9 10:06:17 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Tue Apr 27 12:03:17 2021 -%% Update Count : 539 +%% Last Modified On : Sat May 8 08:48:37 2021 +%% Update Count : 540 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38,14 +38,14 @@ \usepackage{xspace} \newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}} % Cforall icon -\newcommand{\CFA}{\protect\CFAIcon\xspace} % CFA symbolic name -\newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall non-icon name -\newcommand{\Celeven}{\textrm{C11}\xspace} % C11 symbolic name +\newcommand{\CFA}{\protect\CFAIcon\xspace} % CFA symbolic name +\newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall non-icon name +\newcommand{\Celeven}{\textrm{C11}\xspace} % C11 symbolic name \newcommand{\CCIcon}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}} % C++ icon -\newcommand{\CC}{\protect\CCIcon\xspace} % C++ symbolic name +\newcommand{\CC}[1][]{\protect\CCIcon{#1}\xspace} % C++ symbolic name % numbers disallowed in latex variables names => use number names -\newcommand{\CCeleven}{\protect\CCIcon{11}\xspace} % C++11 symbolic name -\newcommand{\CCfourteen}{\protect\CCIcon{14}\xspace} % C++14 symbolic name -\newcommand{\CCseventeen}{\protect\CCIcon{17}\xspace} % C++17 symbolic name -\newcommand{\CCtwenty}{\protect\CCIcon{20}\xspace} % C++20 symbolic name +\newcommand{\CCeleven}{\protect\CCIcon{11}\xspace} % C++11 symbolic name +\newcommand{\CCfourteen}{\protect\CCIcon{14}\xspace} % C++14 symbolic name +\newcommand{\CCseventeen}{\protect\CCIcon{17}\xspace} % C++17 symbolic name +\newcommand{\CCtwenty}{\protect\CCIcon{20}\xspace} % C++20 symbolic name \newcommand{\Csharp}{C\raisebox{-0.7ex}{\Large$^\sharp$}\xspace} % C# symbolic name @@ -153,36 +153,29 @@ % Latin abbreviation \newcommand{\abbrevFont}{\textit} % set empty for no italics +% If not followed by a comma or colon, add a comma. +\newcommand{\CheckCommaColon}{\@ifnextchar{,}{}{\@ifnextchar{:}{}{,\xspace}}} +% If not followed by a period, add a period. +\newcommand{\CheckPeriod}{\@ifnextchar{.}{}{.\xspace}} + \@ifundefined{eg}{ \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.} -\newcommand*{\eg}{% - \@ifnextchar{,}{\EG}% - {\@ifnextchar{:}{\EG}% - {\EG,\xspace}}% -}}{}% +\newcommand{\eg}{\EG\CheckCommaColon} +}{}% \@ifundefined{ie}{ \newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.} -\newcommand*{\ie}{% - \@ifnextchar{,}{\IE}% - {\@ifnextchar{:}{\IE}% - {\IE,\xspace}}% -}}{}% +\newcommand{\ie}{\IE\CheckCommaColon} +}{}% \@ifundefined{etc}{ \newcommand{\ETC}{\abbrevFont{etc}} -\newcommand*{\etc}{% - \@ifnextchar{.}{\ETC}% - {\ETC.\xspace}% -}}{}% +\newcommand{\etc}{\ETC\CheckPeriod} +}{}% \@ifundefined{etal}{ \newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}} -\newcommand*{\etal}{% - \@ifnextchar{.}{\protect\ETAL}% - {\protect\ETAL.\xspace}% -}}{}% +\newcommand{\etal}{\ETAL\CheckPeriod} +}{}% \@ifundefined{viz}{ \newcommand{\VIZ}{\abbrevFont{viz}} -\newcommand*{\viz}{% - \@ifnextchar{.}{\VIZ}% - {\VIZ.\xspace}% -}}{}% +\newcommand{\viz}{\VIZ\CheckPeriod} +}{}% \makeatother Index: doc/theses/mubeen_zulfiqar_MMath/allocator.tex =================================================================== --- doc/theses/mubeen_zulfiqar_MMath/allocator.tex (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ doc/theses/mubeen_zulfiqar_MMath/allocator.tex (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -1,4 +1,26 @@ +\chapter{Allocator} -\chapter{Allocator} +==================== + +Writing Points: + +Objective of uHeapLmmm. +Design philosophy. +Background and previous design of uHeapLmmm. + +Distributed design of uHeapLmmm. +----- SHOULD WE GIVE IMPLEMENTATION DETAILS HERE? ----- +> figure. +> Advantages of distributed design. + +The new features added to uHeapLmmm (incl. malloc_size routine) +CFA alloc interface with examples. +> Why did we need it? +> The added benefits. +----- SHOULD WE GIVE PERFORMANCE AND USABILITY COMPARISON OF DIFFERENT INTERFACES THAT WE TRIED? ----- + +Performance evaluation using u-benchmark suite. + +==================== \newpage Index: doc/theses/mubeen_zulfiqar_MMath/background.tex =================================================================== --- doc/theses/mubeen_zulfiqar_MMath/background.tex (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ doc/theses/mubeen_zulfiqar_MMath/background.tex (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -1,3 +1,17 @@ \chapter{Background} +==================== + +Writing Points: + +Classification of benchmarks. +Literature review of current benchmarks. +Features and limitations. + +Literature review of current memory allocators. +Breakdown of memory allocation techniques. +Fetures and limitations. + +==================== + \cite{Wasik08} Index: doc/theses/mubeen_zulfiqar_MMath/benchmarks.tex =================================================================== --- doc/theses/mubeen_zulfiqar_MMath/benchmarks.tex (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ doc/theses/mubeen_zulfiqar_MMath/benchmarks.tex (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -1,1 +1,20 @@ \chapter{Benchmarks} + +==================== + +Writing Points: + +Performance matrices of memory allocation. + +Aim of micro benchmark suite. +----- SHOULD WE GIVE IMPLEMENTATION DETAILS HERE? ----- +A complete list of benchmarks in micro benchmark suite. + +One detailed section for each benchmark in micro benchmark suite including: +> The introduction of the benchmark. +> Figure. +> Results with popular memory allocators. + +Summarize performance of current memory allocators. + +==================== Index: doc/theses/mubeen_zulfiqar_MMath/conclusion.tex =================================================================== --- doc/theses/mubeen_zulfiqar_MMath/conclusion.tex (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ doc/theses/mubeen_zulfiqar_MMath/conclusion.tex (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -1,1 +1,11 @@ \chapter{Conclusion} + +==================== + +Writing Points: + +Summarize u-benchmark suite. +Summarize uHeapLmmm. +Make recommendations on memory allocator design. + +==================== Index: doc/theses/mubeen_zulfiqar_MMath/intro.tex =================================================================== --- doc/theses/mubeen_zulfiqar_MMath/intro.tex (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ doc/theses/mubeen_zulfiqar_MMath/intro.tex (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -1,1 +1,17 @@ \chapter{Introduction} + +==================== + +Writing Points: + +Introduce dynamic memory allocation with brief background. +Scope of the thesis. +Importance of memory allocation and micro benhmark suite. + +Research problem. +Research objectives. +The vision behind cfa-malloc. + +An outline of the thesis. + +==================== Index: doc/user/Makefile =================================================================== --- doc/user/Makefile (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ doc/user/Makefile (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -61,5 +61,5 @@ ${BASE}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \ - ${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib build/version | ${Build} + ${Macros}/common.sty ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib build/version | ${Build} # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run. if [ ! -r ${basename $@}.ind ] ; then touch ${Build}/${basename $@}.ind ; fi @@ -68,5 +68,5 @@ -${BibTeX} ${Build}/${basename $@} # Some citations reference others so run again to resolve these citations - ${LaTeX} ${basename $@}.tex +# ${LaTeX} ${basename $@}.tex -${BibTeX} ${Build}/${basename $@} # Make index from *.aux entries and input index at end of document @@ -75,5 +75,5 @@ ${LaTeX} ${basename $@}.tex # Run again to get index title into table of contents - ${LaTeX} ${basename $@}.tex +# ${LaTeX} ${basename $@}.tex ## Define the default recipes. Index: doc/user/user.tex =================================================================== --- doc/user/user.tex (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ doc/user/user.tex (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:53:29 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Wed Apr 28 21:48:59 2021 -%% Update Count : 5051 +%% Last Modified On : Sat May 8 08:51:33 2021 +%% Update Count : 5062 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -65,5 +65,6 @@ % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^ % math escape $...$ (dollar symbol) -\input{common} % common CFA document macros +\usepackage{common} % common CFA document macros +%\input{common} % common CFA document macros \setlength{\gcolumnposn}{3in} \CFAStyle % use default CFA format-style @@ -585,5 +586,5 @@ For example, the octal ©0© or hexadecimal ©0x© prefix may end with an underscore ©0_377© or ©0x_ff©; the exponent infix ©E© may start or end with an underscore ©1.0_E10©, ©1.0E_10© or ©1.0_E_10©; -the type suffixes ©U©, ©L©, etc. may start with an underscore ©1_U©, ©1_ll© or ©1.0E10_f©. +the type suffixes ©U©, ©L©, \etc may start with an underscore ©1_U©, ©1_ll© or ©1.0E10_f©. \end{enumerate} It is significantly easier to read and enter long constants when they are broken up into smaller groupings (many cultures use comma and/or period among digits for the same purpose). @@ -1570,5 +1571,5 @@ \end{cquote} -All type qualifiers, \eg ©const©, ©volatile©, etc., are used in the normal way with the new declarations and also appear left to right, \eg: +All type qualifiers, \eg ©const©, ©volatile©, \etc, are used in the normal way with the new declarations and also appear left to right, \eg: \begin{cquote} \begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}} @@ -1590,5 +1591,5 @@ \end{tabular} \end{cquote} -All declaration qualifiers, \eg ©extern©, ©static©, etc., are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier} +All declaration qualifiers, \eg ©extern©, ©static©, \etc, are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier} The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}} \eg: \begin{cquote} @@ -3147,5 +3148,5 @@ also, it is unnecessary to specify all the fields of a struct in a multiple record-field tuple. -Since tuple-index expressions are a form of member-access expression, it is possible to use tuple-index expressions in conjunction with member-access expressions to restructure a tuple (\eg, rearrange components, drop components, duplicate components, etc.). +Since tuple-index expressions are a form of member-access expression, it is possible to use tuple-index expressions in conjunction with member-access expressions to restructure a tuple (\eg, rearrange components, drop components, duplicate components, \etc). \begin{cfa} [ int, int, long, double ] x; @@ -3972,5 +3973,5 @@ \item -\Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} toggle printing the separator with respect to the next printed item, and then return to the global seperator setting. +\Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} toggle printing the separator with respect to the next printed item, and then return to the global separator setting. \begin{cfa}[belowskip=0pt] sout | 1 | sepOff | 2 | 3; $\C{// turn off implicit separator for the next item}$ @@ -5659,7 +5660,7 @@ \item Package: a container to organize modules for distribution; It has attributes like name, author, -version, dependences, etc. -\item -Project: a working set for a \CFA project; It has attributes like name, author, version, dependences, etc. +version, dependences, \etc. +\item +Project: a working set for a \CFA project; It has attributes like name, author, version, dependences, \etc. \end{itemize} @@ -5798,5 +5799,5 @@ A package is defined by putting a project description file, Do.prj, with one or more modules into a directory. -This project description file contains the package's meta data, including package name, author, version, dependences, etc. +This project description file contains the package's meta data, including package name, author, version, dependences, \etc. It should be in the root of the package directory. @@ -5855,7 +5856,7 @@ Module: a container to organize a set of related types and methods; It has a module name, and several interfaces visible from outside \item -Package: a container to organize modules for distribution; It has attributes like name, author, version, dependences, etc. -\item -Project: a working set for a \CFA project; It has attributes like name, author, version, dependences, etc. +Package: a container to organize modules for distribution; It has attributes like name, author, version, dependences, \etc. +\item +Project: a working set for a \CFA project; It has attributes like name, author, version, dependences, \etc. \end{itemize} Index: libcfa/src/common.hfa =================================================================== --- libcfa/src/common.hfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/common.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -10,6 +10,6 @@ // Created On : Wed Jul 11 17:54:36 2018 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Aug 15 08:51:29 2020 -// Update Count : 14 +// Last Modified On : Wed May 5 14:02:04 2021 +// Update Count : 18 // @@ -67,15 +67,23 @@ static inline { - char min( char t1, char t2 ) { return t1 < t2 ? t1 : t2; } // optimization - intptr_t min( intptr_t t1, intptr_t t2 ) { return t1 < t2 ? t1 : t2; } // optimization - uintptr_t min( uintptr_t t1, uintptr_t t2 ) { return t1 < t2 ? t1 : t2; } // optimization + char min( char v1, char v2 ) { return v1 < v2 ? v1 : v2; } // optimization + int min( int v1, int v2 ) { return v1 < v2 ? v1 : v2; } + unsigned int min( unsigned int v1, unsigned int v2 ) { return v1 < v2 ? v1 : v2; } + long int min( long int v1, long int v2 ) { return v1 < v2 ? v1 : v2; } + unsigned long int min( unsigned long int v1, unsigned int v2 ) { return v1 < v2 ? v1 : v2; } + long long int min( long long int v1, long long int v2 ) { return v1 < v2 ? v1 : v2; } + unsigned long long int min( unsigned long long int v1, unsigned int v2 ) { return v1 < v2 ? v1 : v2; } forall( T | { int ? t2 ? t1 : t2; } // optimization - intptr_t max( intptr_t t1, intptr_t t2 ) { return t1 > t2 ? t1 : t2; } // optimization - uintptr_t max( uintptr_t t1, uintptr_t t2 ) { return t1 > t2 ? t1 : t2; } // optimization + char max( char v1, char v2 ) { return v1 > v2 ? v1 : v2; } // optimization + int max( int v1, int v2 ) { return v1 > v2 ? v1 : v2; } + unsigned int max( unsigned int v1, unsigned int v2 ) { return v1 > v2 ? v1 : v2; } + long int max( long int v1, long int v2 ) { return v1 > v2 ? v1 : v2; } + unsigned long int max( unsigned long int v1, unsigned long int v2 ) { return v1 > v2 ? v1 : v2; } + long long int max( long long int v1, long long int v2 ) { return v1 > v2 ? v1 : v2; } + unsigned long long int max( unsigned long long int v1, unsigned long long int v2 ) { return v1 > v2 ? v1 : v2; } forall( T | { int ?>?( T, T ); } ) - T max( T t1, T t2 ) { return t1 > t2 ? t1 : t2; } + T max( T v1, T v2 ) { return v1 > v2 ? v1 : v2; } forall( T | { T min( T, T ); T max( T, T ); } ) Index: libcfa/src/concurrency/alarm.cfa =================================================================== --- libcfa/src/concurrency/alarm.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/alarm.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -38,6 +38,11 @@ void __kernel_set_timer( Duration alarm ) { - verifyf(alarm >= 1`us || alarm == 0, "Setting timer to < 1us (%jins)", alarm`ns); - setitimer( ITIMER_REAL, &(itimerval){ alarm }, 0p ); + alarm = max(alarm, 1`us); + itimerval otv @= { 0 }; + getitimer( ITIMER_REAL, &otv ); + Duration od = { otv.it_value }; + if(od == 0 || od > alarm) { + setitimer( ITIMER_REAL, &(itimerval){ alarm }, 0p ); + } } @@ -46,23 +51,26 @@ //============================================================================================= -void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period) with( this ) { +void ?{}( alarm_node_t & this, $thread * thrd, Duration alarm, Duration period) with( this ) { + this.initial = alarm; + this.period = period; this.thrd = thrd; - this.alarm = alarm; - this.period = period; + this.timeval = __kernel_get_time() + alarm; set = false; type = User; } -void ?{}( alarm_node_t & this, processor * proc, Time alarm, Duration period ) with( this ) { +void ?{}( alarm_node_t & this, processor * proc, Duration alarm, Duration period ) with( this ) { + this.initial = alarm; + this.period = period; this.proc = proc; - this.alarm = alarm; - this.period = period; + this.timeval = __kernel_get_time() + alarm; set = false; type = Kernel; } -void ?{}( alarm_node_t & this, Alarm_Callback callback, Time alarm, Duration period ) with( this ) { - this.alarm = alarm; - this.period = period; +void ?{}( alarm_node_t & this, Alarm_Callback callback, Duration alarm, Duration period ) with( this ) { this.callback = callback; + this.initial = alarm; + this.period = period; + this.timeval = __kernel_get_time() + alarm; set = false; type = Callback; @@ -77,5 +85,5 @@ void insert( alarm_list_t * this, alarm_node_t * n ) { alarm_node_t * it = & (*this)`first; - while( it && (n->alarm > it->alarm) ) { + while( it && (n->timeval > it->timeval) ) { it = & (*it)`next; } @@ -105,12 +113,10 @@ lock( event_kernel->lock __cfaabi_dbg_ctx2 ); { - verify( validate( alarms ) ); - bool first = ! & alarms`first; + /* paranoid */ verify( validate( alarms ) ); - __cfadbg_print_safe( preemption, " KERNEL: alarm inserting %p (%lu).\n", this, this->alarm.tn ); + Time curr = __kernel_get_time(); + __cfadbg_print_safe( preemption, " KERNEL: alarm inserting %p (%lu -> %lu).\n", this, curr.tn, this->timeval.tn ); insert( &alarms, this ); - if( first ) { - __kernel_set_timer( alarms`first.alarm - __kernel_get_time() ); - } + __kernel_set_timer( this->timeval - curr); } unlock( event_kernel->lock ); @@ -136,5 +142,5 @@ void sleep( Duration duration ) { - alarm_node_t node = { active_thread(), __kernel_get_time() + duration, 0`s }; + alarm_node_t node = { active_thread(), duration, 0`s }; register_self( &node ); Index: libcfa/src/concurrency/alarm.hfa =================================================================== --- libcfa/src/concurrency/alarm.hfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/alarm.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -46,26 +46,27 @@ struct alarm_node_t { - Time alarm; // time when alarm goes off - Duration period; // if > 0 => period of alarm + Duration initial; // time when alarm goes off + Duration period; // if > 0 => period of alarm - DLISTED_MGD_IMPL_IN(alarm_node_t) + inline dlink(alarm_node_t); union { - $thread * thrd; // thrd who created event - processor * proc; // proc who created event - Alarm_Callback callback; // callback to handle event + $thread * thrd; // thrd who created event + processor * proc; // proc who created event + Alarm_Callback callback; // callback to handle event }; - bool set :1; // whether or not the alarm has be registered - enum alarm_type type; // true if this is not a user defined alarm + Time timeval; // actual time at which the alarm goes off + enum alarm_type type; // true if this is not a user defined alarm + bool set :1; // whether or not the alarm has be registered }; -DLISTED_MGD_IMPL_OUT(alarm_node_t) +P9_EMBEDDED( alarm_node_t, dlink(alarm_node_t) ) -void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period ); -void ?{}( alarm_node_t & this, processor * proc, Time alarm, Duration period ); -void ?{}( alarm_node_t & this, Alarm_Callback callback, Time alarm, Duration period ); +void ?{}( alarm_node_t & this, $thread * thrd, Duration alarm, Duration period ); +void ?{}( alarm_node_t & this, processor * proc, Duration alarm, Duration period ); +void ?{}( alarm_node_t & this, Alarm_Callback callback, Duration alarm, Duration period ); void ^?{}( alarm_node_t & this ); -typedef dlist(alarm_node_t, alarm_node_t) alarm_list_t; +typedef dlist(alarm_node_t) alarm_list_t; void insert( alarm_list_t * this, alarm_node_t * n ); Index: libcfa/src/concurrency/clib/cfathread.cfa =================================================================== --- libcfa/src/concurrency/clib/cfathread.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/clib/cfathread.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -27,4 +27,6 @@ extern void __cfactx_invoke_thread(void (*main)(void *), void * this); } + +extern Time __kernel_get_time(); //================================================================================ @@ -265,5 +267,8 @@ int cfathread_cond_timedwait(cfathread_cond_t *restrict cond, cfathread_mutex_t *restrict mut, const struct timespec *restrict abstime) __attribute__((nonnull (1,2,3))) { Time t = { *abstime }; - if( wait( (*cond)->impl, (*mut)->impl, t ) ) { + timespec curr; + clock_gettime( CLOCK_REALTIME, &curr ); + Time c = { curr }; + if( wait( (*cond)->impl, (*mut)->impl, t - c ) ) { return 0; } Index: libcfa/src/concurrency/clib/cfathread.h =================================================================== --- libcfa/src/concurrency/clib/cfathread.h (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/clib/cfathread.h (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -80,4 +80,6 @@ typedef struct cfathread_cond_attr { + // WARNING: adding support for pthread_condattr_setclock would require keeping track of the clock + // and reading it in cond_timedwait } cfathread_condattr_t; typedef struct cfathread_condition * cfathread_cond_t; Index: libcfa/src/concurrency/kernel.cfa =================================================================== --- libcfa/src/concurrency/kernel.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/kernel.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -171,6 +171,4 @@ preemption_scope scope = { this }; - __STATS( unsigned long long last_tally = rdtscl(); ) - // if we need to run some special setup, now is the time to do it. if(this->init.thrd) { @@ -184,5 +182,6 @@ MAIN_LOOP: for() { - #if 1 + #define OLD_MAIN 1 + #if OLD_MAIN // Check if there is pending io __maybe_io_drain( this ); @@ -259,12 +258,4 @@ if( __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST) ) break MAIN_LOOP; - #if !defined(__CFA_NO_STATISTICS__) - unsigned long long curr = rdtscl(); - if(curr > (last_tally + 500000000)) { - __tally_stats(this->cltr->stats, __cfaabi_tls.this_stats); - last_tally = curr; - } - #endif - if(this->io.pending && !this->io.dirty) { __cfa_io_flush( this ); @@ -272,8 +263,7 @@ #else - + #warning new kernel loop SEARCH: { /* paranoid */ verify( ! __preemption_enabled() ); - /* paranoid */ verify( kernelTLS().this_proc_id ); // First, lock the scheduler since we are searching for a thread @@ -288,5 +278,5 @@ // Spin a little on I/O, just in case - for(25) { + for(5) { __maybe_io_drain( this ); readyThread = pop_fast( this->cltr ); @@ -295,5 +285,5 @@ // no luck, try stealing a few times - for(25) { + for(5) { if( __maybe_io_drain( this ) ) { readyThread = pop_fast( this->cltr ); @@ -333,5 +323,5 @@ } - __STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 0\n", this->id, rdtscl()); ) + __STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 0\n", this->unique_id, rdtscl()); ) __cfadbg_print_safe(runtime_core, "Kernel : core %p waiting on eventfd %d\n", this, this->idle); @@ -341,5 +331,5 @@ // __enable_interrupts_hard(); - __STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 1\n", this->id, rdtscl()); ) + __STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 1\n", this->unique_id, rdtscl()); ) // We were woken up, remove self from idle @@ -351,5 +341,4 @@ RUN_THREAD: - /* paranoid */ verify( kernelTLS().this_proc_id ); /* paranoid */ verify( ! __preemption_enabled() ); /* paranoid */ verify( readyThread ); @@ -363,12 +352,4 @@ // Are we done? if( __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST) ) break MAIN_LOOP; - - #if !defined(__CFA_NO_STATISTICS__) - unsigned long long curr = rdtscl(); - if(curr > (last_tally + 500000000)) { - __tally_stats(this->cltr->stats, __cfaabi_tls.this_stats); - last_tally = curr; - } - #endif if(this->io.pending && !this->io.dirty) { @@ -887,7 +868,11 @@ unsigned tail = *ctx->cq.tail; if(head == tail) return false; + #if OLD_MAIN ready_schedule_lock(); ret = __cfa_io_drain( proc ); ready_schedule_unlock(); + #else + ret = __cfa_io_drain( proc ); + #endif #endif return ret; @@ -918,5 +903,32 @@ } + static void crawl_list( cluster * cltr, dlist(processor) & list, unsigned count ) { + /* paranoid */ verify( cltr->stats ); + + processor * it = &list`first; + for(unsigned i = 0; i < count; i++) { + /* paranoid */ verifyf( it, "Unexpected null iterator, at index %u of %u\n", i, count); + /* paranoid */ verify( it->local_data->this_stats ); + __tally_stats( cltr->stats, it->local_data->this_stats ); + it = &(*it)`next; + } + } + + void crawl_cluster_stats( cluster & this ) { + // Stop the world, otherwise stats could get really messed-up + // this doesn't solve all problems but does solve many + // so it's probably good enough + uint_fast32_t last_size = ready_mutate_lock(); + + crawl_list(&this, this.procs.actives, this.procs.total - this.procs.idle); + crawl_list(&this, this.procs.idles , this.procs.idle ); + + // Unlock the RWlock + ready_mutate_unlock( last_size ); + } + + void print_stats_now( cluster & this, int flags ) { + crawl_cluster_stats( this ); __print_stats( this.stats, this.print_stats, "Cluster", this.name, (void*)&this ); } Index: libcfa/src/concurrency/kernel.hfa =================================================================== --- libcfa/src/concurrency/kernel.hfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/kernel.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -107,5 +107,5 @@ // Link lists fields - DLISTED_MGD_IMPL_IN(processor) + inline dlink(processor); // special init fields @@ -117,4 +117,6 @@ } init; + struct KernelThreadData * local_data; + #if !defined(__CFA_NO_STATISTICS__) int print_stats; @@ -127,4 +129,5 @@ #endif }; +P9_EMBEDDED( processor, dlink(processor) ) void ?{}(processor & this, const char name[], struct cluster & cltr); @@ -134,6 +137,4 @@ static inline void ?{}(processor & this, struct cluster & cltr) { this{ "Anonymous Processor", cltr}; } static inline void ?{}(processor & this, const char name[]) { this{name, *mainCluster}; } - -DLISTED_MGD_IMPL_OUT(processor) //----------------------------------------------------------------------------- @@ -146,7 +147,10 @@ // Aligned timestamps which are used by the relaxed ready queue -struct __attribute__((aligned(128))) __timestamp_t; -void ?{}(__timestamp_t & this); -void ^?{}(__timestamp_t & this); +struct __attribute__((aligned(128))) __timestamp_t { + volatile unsigned long long tv; +}; + +static inline void ?{}(__timestamp_t & this) { this.tv = 0; } +static inline void ^?{}(__timestamp_t & this) {} //TODO adjust cache size to ARCHITECTURE @@ -171,4 +175,7 @@ void ?{}(__ready_queue_t & this); void ^?{}(__ready_queue_t & this); +#if !defined(__CFA_NO_STATISTICS__) + unsigned cnt(const __ready_queue_t & this, unsigned idx); +#endif // Idle Sleep @@ -184,8 +191,8 @@ // List of idle processors - dlist(processor, processor) idles; + dlist(processor) idles; // List of active processors - dlist(processor, processor) actives; + dlist(processor) actives; }; Index: libcfa/src/concurrency/kernel/startup.cfa =================================================================== --- libcfa/src/concurrency/kernel/startup.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/kernel/startup.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -228,4 +228,5 @@ __init_stats( __cfaabi_tls.this_stats ); #endif + mainProcessor->local_data = &__cfaabi_tls; // Enable preemption @@ -282,4 +283,6 @@ #endif + mainProcessor->local_data = 0p; + unregister_tls( mainProcessor ); @@ -329,4 +332,5 @@ __cfaabi_tls.this_thread = 0p; __cfaabi_tls.preemption_state.[enabled, disable_count] = [false, 1]; + proc->local_data = &__cfaabi_tls; register_tls( proc ); @@ -368,4 +372,6 @@ #endif #endif + + proc->local_data = 0p; unregister_tls( proc ); @@ -490,5 +496,5 @@ this.rdq.id = -1u; this.rdq.target = -1u; - this.rdq.cutoff = -1ull; + this.rdq.cutoff = 0ull; do_terminate = false; preemption_alarm = 0p; @@ -500,4 +506,6 @@ this.init.thrd = initT; + + this.local_data = 0p; this.idle = eventfd(0, 0); Index: libcfa/src/concurrency/locks.cfa =================================================================== --- libcfa/src/concurrency/locks.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/locks.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -191,5 +191,5 @@ }; - void ?{}( alarm_node_wrap(L) & this, Time alarm, Duration period, Alarm_Callback callback, condition_variable(L) * c, info_thread(L) * i ) { + void ?{}( alarm_node_wrap(L) & this, Duration alarm, Duration period, Alarm_Callback callback, condition_variable(L) * c, info_thread(L) * i ) { this.alarm_node{ callback, alarm, period }; this.cond = c; @@ -313,5 +313,5 @@ // helper for wait()'s' with a timeout - void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Time t ) with(this) { + void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration t ) with(this) { lock( lock __cfaabi_dbg_ctx2 ); size_t recursion_count = queue_and_get_recursion(this, &info); @@ -340,12 +340,8 @@ void wait( condition_variable(L) & this, L & l, uintptr_t info ) with(this) { WAIT( info, &l ) } - bool wait( condition_variable(L) & this, Duration duration ) with(this) { WAIT_TIME( 0 , 0p , __kernel_get_time() + duration ) } - bool wait( condition_variable(L) & this, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, 0p , __kernel_get_time() + duration ) } - bool wait( condition_variable(L) & this, Time time ) with(this) { WAIT_TIME( 0 , 0p , time ) } - bool wait( condition_variable(L) & this, uintptr_t info, Time time ) with(this) { WAIT_TIME( info, 0p , time ) } - bool wait( condition_variable(L) & this, L & l, Duration duration ) with(this) { WAIT_TIME( 0 , &l , __kernel_get_time() + duration ) } - bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, &l , __kernel_get_time() + duration ) } - bool wait( condition_variable(L) & this, L & l, Time time ) with(this) { WAIT_TIME( 0 , &l , time ) } - bool wait( condition_variable(L) & this, L & l, uintptr_t info, Time time ) with(this) { WAIT_TIME( info, &l , time ) } + bool wait( condition_variable(L) & this, Duration duration ) with(this) { WAIT_TIME( 0 , 0p , duration ) } + bool wait( condition_variable(L) & this, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, 0p , duration ) } + bool wait( condition_variable(L) & this, L & l, Duration duration ) with(this) { WAIT_TIME( 0 , &l , duration ) } + bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, &l , duration ) } } Index: libcfa/src/concurrency/locks.hfa =================================================================== --- libcfa/src/concurrency/locks.hfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/locks.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -290,6 +290,4 @@ bool wait( condition_variable(L) & this, Duration duration ); bool wait( condition_variable(L) & this, uintptr_t info, Duration duration ); - bool wait( condition_variable(L) & this, Time time ); - bool wait( condition_variable(L) & this, uintptr_t info, Time time ); void wait( condition_variable(L) & this, L & l ); @@ -297,5 +295,3 @@ bool wait( condition_variable(L) & this, L & l, Duration duration ); bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration ); - bool wait( condition_variable(L) & this, L & l, Time time ); - bool wait( condition_variable(L) & this, L & l, uintptr_t info, Time time ); -} +} Index: libcfa/src/concurrency/preemption.cfa =================================================================== --- libcfa/src/concurrency/preemption.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/preemption.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -18,4 +18,5 @@ #include "preemption.hfa" + #include @@ -26,4 +27,5 @@ #include // PTHREAD_STACK_MIN +#include "bits/debug.hfa" #include "bits/signal.hfa" #include "kernel_private.hfa" @@ -105,5 +107,5 @@ static inline alarm_node_t * get_expired( alarm_list_t * alarms, Time currtime ) { if( ! & (*alarms)`first ) return 0p; // If no alarms return null - if( (*alarms)`first.alarm >= currtime ) return 0p; // If alarms head not expired return null + if( (*alarms)`first.timeval >= currtime ) return 0p; // If alarms head not expired return null return pop(alarms); // Otherwise just pop head } @@ -141,5 +143,5 @@ if( period > 0 ) { __cfadbg_print_buffer_local( preemption, " KERNEL: alarm period is %lu.\n", period`ns ); - node->alarm = currtime + period; // Alarm is periodic, add currtime to it (used cached current time) + node->timeval = currtime + period; // Alarm is periodic, add currtime to it (used cached current time) insert( alarms, node ); // Reinsert the node for the next time it triggers } @@ -148,7 +150,6 @@ // If there are still alarms pending, reset the timer if( & (*alarms)`first ) { - Duration delta = (*alarms)`first.alarm - currtime; - Duration capped = max(delta, 50`us); - __kernel_set_timer( capped ); + Duration delta = (*alarms)`first.timeval - currtime; + __kernel_set_timer( delta ); } } @@ -160,6 +161,6 @@ // Alarms need to be enabled if ( duration > 0 && ! alarm->set ) { - alarm->alarm = __kernel_get_time() + duration; - alarm->period = duration; + alarm->initial = duration; + alarm->period = duration; register_self( alarm ); } @@ -167,12 +168,12 @@ else if ( duration == 0 && alarm->set ) { unregister_self( alarm ); - alarm->alarm = 0; - alarm->period = 0; + alarm->initial = 0; + alarm->period = 0; } // If alarm is different from previous, change it else if ( duration > 0 && alarm->period != duration ) { unregister_self( alarm ); - alarm->alarm = __kernel_get_time() + duration; - alarm->period = duration; + alarm->initial = duration; + alarm->period = duration; register_self( alarm ); } @@ -599,5 +600,6 @@ // Notify the alarm thread of the shutdown - sigval val = { 1 }; + sigval val; + val.sival_int = 0; pthread_sigqueue( alarm_thread, SIGALRM, val ); @@ -619,5 +621,5 @@ // Used by thread to control when they want to receive preemption signals void ?{}( preemption_scope & this, processor * proc ) { - (this.alarm){ proc, (Time){ 0 }, 0`s }; + (this.alarm){ proc, 0`s, 0`s }; this.proc = proc; this.proc->preemption_alarm = &this.alarm; @@ -705,4 +707,7 @@ int sig = sigwaitinfo( &mask, &info ); + __cfadbg_print_buffer_decl ( preemption, " KERNEL: sigwaitinfo returned %d, c: %d, v: %d\n", sig, info.si_code, info.si_value.sival_int ); + __cfadbg_print_buffer_local( preemption, " KERNEL: SI_QUEUE %d, SI_TIMER %d, SI_KERNEL %d\n", SI_QUEUE, SI_TIMER, SI_KERNEL ); + if( sig < 0 ) { //Error! @@ -711,5 +716,5 @@ case EAGAIN : case EINTR : - {__cfaabi_dbg_print_buffer_decl( " KERNEL: Spurious wakeup %d.\n", err );} + {__cfadbg_print_buffer_local( preemption, " KERNEL: Spurious wakeup %d.\n", err );} continue; case EINVAL : @@ -723,8 +728,19 @@ assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int); - // __cfaabi_dbg_print_safe( "Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int ); // Switch on the code (a.k.a. the sender) to switch( info.si_code ) { + // Signal was not sent by the kernel but by an other thread + case SI_QUEUE: + // other threads may signal the alarm thread to shut it down + // or to manual cause the preemption tick + // use info.si_value and handle the case here + switch( info.si_value.sival_int ) { + case 0: + goto EXIT; + default: + abort( "SI_QUEUE with val %d", info.si_value.sival_int); + } + // fallthrough // Timers can apparently be marked as sent for the kernel // In either case, tick preemption @@ -736,9 +752,4 @@ unlock( event_kernel->lock ); break; - // Signal was not sent by the kernel but by an other thread - case SI_QUEUE: - // For now, other thread only signal the alarm thread to shut it down - // If this needs to change use info.si_value and handle the case here - goto EXIT; } } Index: libcfa/src/concurrency/ready_queue.cfa =================================================================== --- libcfa/src/concurrency/ready_queue.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/ready_queue.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -398,13 +398,11 @@ if(proc->rdq.target == -1u) { + unsigned long long min = ts(lanes.data[proc->rdq.id]); + for(int i = 0; i < READYQ_SHARD_FACTOR; i++) { + unsigned long long tsc = ts(lanes.data[proc->rdq.id + i]); + if(tsc < min) min = tsc; + } + proc->rdq.cutoff = min; proc->rdq.target = __tls_rand() % lanes.count; - unsigned it1 = proc->rdq.itr; - unsigned it2 = proc->rdq.itr + 1; - unsigned idx1 = proc->rdq.id + (it1 % READYQ_SHARD_FACTOR); - unsigned idx2 = proc->rdq.id + (it2 % READYQ_SHARD_FACTOR); - unsigned long long tsc1 = ts(lanes.data[idx1]); - unsigned long long tsc2 = ts(lanes.data[idx2]); - proc->rdq.cutoff = min(tsc1, tsc2); - if(proc->rdq.cutoff == 0) proc->rdq.cutoff = -1ull; } else { @@ -418,5 +416,5 @@ for(READYQ_SHARD_FACTOR) { - unsigned i = proc->rdq.id + (--proc->rdq.itr % READYQ_SHARD_FACTOR); + unsigned i = proc->rdq.id + (proc->rdq.itr++ % READYQ_SHARD_FACTOR); if($thread * t = try_pop(cltr, i __STATS(, __tls_stats()->ready.pop.local))) return t; } @@ -469,5 +467,6 @@ // Actually pop the list struct $thread * thrd; - thrd = pop(lane); + unsigned long long tsv; + [thrd, tsv] = pop(lane); /* paranoid */ verify(thrd); @@ -481,5 +480,5 @@ #if defined(USE_WORK_STEALING) - lanes.tscs[w].tv = thrd->link.ts; + lanes.tscs[w].tv = tsv; #endif @@ -553,5 +552,5 @@ } -static void assign_list(unsigned & value, dlist(processor, processor) & list, unsigned count) { +static void assign_list(unsigned & value, dlist(processor) & list, unsigned count) { processor * it = &list`first; for(unsigned i = 0; i < count; i++) { @@ -663,5 +662,6 @@ while(!is_empty(lanes.data[idx])) { struct $thread * thrd; - thrd = pop(lanes.data[idx]); + unsigned long long _; + [thrd, _] = pop(lanes.data[idx]); push(cltr, thrd); @@ -702,2 +702,9 @@ /* paranoid */ verify( ready_mutate_islocked() ); } + +#if !defined(__CFA_NO_STATISTICS__) + unsigned cnt(const __ready_queue_t & this, unsigned idx) { + /* paranoid */ verify(this.lanes.count > idx); + return this.lanes.data[idx].cnt; + } +#endif Index: libcfa/src/concurrency/ready_subqueue.hfa =================================================================== --- libcfa/src/concurrency/ready_subqueue.hfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/ready_subqueue.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -13,4 +13,8 @@ __thread_desc_link anchor; + + #if !defined(__CFA_NO_STATISTICS__) + unsigned cnt; + #endif }; @@ -29,6 +33,10 @@ this.anchor.next = 0p; this.anchor.ts = 0; + #if !defined(__CFA_NO_STATISTICS__) + this.cnt = 0; + #endif // We add a boat-load of assertions here because the anchor code is very fragile + /* paranoid */ _Static_assert( offsetof( $thread, link ) == offsetof(__intrusive_lane_t, anchor) ); /* paranoid */ verify( offsetof( $thread, link ) == offsetof(__intrusive_lane_t, anchor) ); /* paranoid */ verify( ((uintptr_t)( mock_head(this) ) + offsetof( $thread, link )) == (uintptr_t)(&this.anchor) ); @@ -53,5 +61,6 @@ // Push a thread onto this lane // returns true of lane was empty before push, false otherwise -void push( __intrusive_lane_t & this, $thread * node ) { +static inline void push( __intrusive_lane_t & this, $thread * node ) { + /* paranoid */ verify( this.lock ); /* paranoid */ verify( node->link.next == 0p ); /* paranoid */ verify( node->link.ts == 0 ); @@ -72,4 +81,7 @@ this.prev->link.ts = rdtscl(); this.prev = node; + #if !defined(__CFA_NO_STATISTICS__) + this.cnt++; + #endif } @@ -77,9 +89,11 @@ // returns popped // returns true of lane was empty before push, false otherwise -$thread * pop( __intrusive_lane_t & this ) { +static inline [* $thread, unsigned long long] pop( __intrusive_lane_t & this ) { + /* paranoid */ verify( this.lock ); /* paranoid */ verify( this.anchor.next != 0p ); /* paranoid */ verify( this.anchor.ts != 0 ); // Get the relevant nodes locally + unsigned long long ts = this.anchor.ts; $thread * node = this.anchor.next; this.anchor.next = node->link.next; @@ -88,4 +102,7 @@ node->link.next = 0p; node->link.ts = 0; + #if !defined(__CFA_NO_STATISTICS__) + this.cnt--; + #endif // Update head time stamp @@ -94,5 +111,5 @@ /* paranoid */ verify( node->link.next == 0p ); /* paranoid */ verify( node->link.ts == 0 ); - return node; + return [node, ts]; } @@ -107,10 +124,2 @@ return this.anchor.ts; } - -// Aligned timestamps which are used by the relaxed ready queue -struct __attribute__((aligned(128))) __timestamp_t { - volatile unsigned long long tv; -}; - -void ?{}(__timestamp_t & this) { this.tv = 0; } -void ^?{}(__timestamp_t & this) {} Index: libcfa/src/concurrency/stats.cfa =================================================================== --- libcfa/src/concurrency/stats.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/concurrency/stats.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -68,54 +68,64 @@ } + static inline void tally_one( volatile uint64_t * agg, volatile uint64_t * val) { + uint64_t add = __atomic_exchange_n(val, 0_l64u, __ATOMIC_RELAXED); + __atomic_fetch_add(agg, add, __ATOMIC_RELAXED); + } + + static inline void tally_one( volatile int64_t * agg, volatile int64_t * val) { + int64_t add = __atomic_exchange_n(val, 0_l64, __ATOMIC_RELAXED); + __atomic_fetch_add(agg, add, __ATOMIC_RELAXED); + } + void __tally_stats( struct __stats_t * cltr, struct __stats_t * proc ) { - __atomic_fetch_add( &cltr->ready.push.local.attempt, proc->ready.push.local.attempt, __ATOMIC_SEQ_CST ); proc->ready.push.local.attempt = 0; - __atomic_fetch_add( &cltr->ready.push.local.success, proc->ready.push.local.success, __ATOMIC_SEQ_CST ); proc->ready.push.local.success = 0; - __atomic_fetch_add( &cltr->ready.push.share.attempt, proc->ready.push.share.attempt, __ATOMIC_SEQ_CST ); proc->ready.push.share.attempt = 0; - __atomic_fetch_add( &cltr->ready.push.share.success, proc->ready.push.share.success, __ATOMIC_SEQ_CST ); proc->ready.push.share.success = 0; - __atomic_fetch_add( &cltr->ready.push.extrn.attempt, proc->ready.push.extrn.attempt, __ATOMIC_SEQ_CST ); proc->ready.push.extrn.attempt = 0; - __atomic_fetch_add( &cltr->ready.push.extrn.success, proc->ready.push.extrn.success, __ATOMIC_SEQ_CST ); proc->ready.push.extrn.success = 0; - __atomic_fetch_add( &cltr->ready.pop.local .attempt, proc->ready.pop.local .attempt, __ATOMIC_SEQ_CST ); proc->ready.pop.local .attempt = 0; - __atomic_fetch_add( &cltr->ready.pop.local .success, proc->ready.pop.local .success, __ATOMIC_SEQ_CST ); proc->ready.pop.local .success = 0; - __atomic_fetch_add( &cltr->ready.pop.local .elock , proc->ready.pop.local .elock , __ATOMIC_SEQ_CST ); proc->ready.pop.local .elock = 0; - __atomic_fetch_add( &cltr->ready.pop.local .eempty , proc->ready.pop.local .eempty , __ATOMIC_SEQ_CST ); proc->ready.pop.local .eempty = 0; - __atomic_fetch_add( &cltr->ready.pop.local .espec , proc->ready.pop.local .espec , __ATOMIC_SEQ_CST ); proc->ready.pop.local .espec = 0; - __atomic_fetch_add( &cltr->ready.pop.help .attempt, proc->ready.pop.help .attempt, __ATOMIC_SEQ_CST ); proc->ready.pop.help .attempt = 0; - __atomic_fetch_add( &cltr->ready.pop.help .success, proc->ready.pop.help .success, __ATOMIC_SEQ_CST ); proc->ready.pop.help .success = 0; - __atomic_fetch_add( &cltr->ready.pop.help .elock , proc->ready.pop.help .elock , __ATOMIC_SEQ_CST ); proc->ready.pop.help .elock = 0; - __atomic_fetch_add( &cltr->ready.pop.help .eempty , proc->ready.pop.help .eempty , __ATOMIC_SEQ_CST ); proc->ready.pop.help .eempty = 0; - __atomic_fetch_add( &cltr->ready.pop.help .espec , proc->ready.pop.help .espec , __ATOMIC_SEQ_CST ); proc->ready.pop.help .espec = 0; - __atomic_fetch_add( &cltr->ready.pop.steal .attempt, proc->ready.pop.steal .attempt, __ATOMIC_SEQ_CST ); proc->ready.pop.steal .attempt = 0; - __atomic_fetch_add( &cltr->ready.pop.steal .success, proc->ready.pop.steal .success, __ATOMIC_SEQ_CST ); proc->ready.pop.steal .success = 0; - __atomic_fetch_add( &cltr->ready.pop.steal .elock , proc->ready.pop.steal .elock , __ATOMIC_SEQ_CST ); proc->ready.pop.steal .elock = 0; - __atomic_fetch_add( &cltr->ready.pop.steal .eempty , proc->ready.pop.steal .eempty , __ATOMIC_SEQ_CST ); proc->ready.pop.steal .eempty = 0; - __atomic_fetch_add( &cltr->ready.pop.steal .espec , proc->ready.pop.steal .espec , __ATOMIC_SEQ_CST ); proc->ready.pop.steal .espec = 0; - __atomic_fetch_add( &cltr->ready.pop.search.attempt, proc->ready.pop.search.attempt, __ATOMIC_SEQ_CST ); proc->ready.pop.search.attempt = 0; - __atomic_fetch_add( &cltr->ready.pop.search.success, proc->ready.pop.search.success, __ATOMIC_SEQ_CST ); proc->ready.pop.search.success = 0; - __atomic_fetch_add( &cltr->ready.pop.search.elock , proc->ready.pop.search.elock , __ATOMIC_SEQ_CST ); proc->ready.pop.search.elock = 0; - __atomic_fetch_add( &cltr->ready.pop.search.eempty , proc->ready.pop.search.eempty , __ATOMIC_SEQ_CST ); proc->ready.pop.search.eempty = 0; - __atomic_fetch_add( &cltr->ready.pop.search.espec , proc->ready.pop.search.espec , __ATOMIC_SEQ_CST ); proc->ready.pop.search.espec = 0; - __atomic_fetch_add( &cltr->ready.threads.migration , proc->ready.threads.migration , __ATOMIC_SEQ_CST ); proc->ready.threads.migration = 0; - __atomic_fetch_add( &cltr->ready.threads.extunpark , proc->ready.threads.extunpark , __ATOMIC_SEQ_CST ); proc->ready.threads.extunpark = 0; - __atomic_fetch_add( &cltr->ready.threads.threads , proc->ready.threads.threads , __ATOMIC_SEQ_CST ); proc->ready.threads.threads = 0; - __atomic_fetch_add( &cltr->ready.sleep.halts , proc->ready.sleep.halts , __ATOMIC_SEQ_CST ); proc->ready.sleep.halts = 0; - __atomic_fetch_add( &cltr->ready.sleep.cancels , proc->ready.sleep.cancels , __ATOMIC_SEQ_CST ); proc->ready.sleep.cancels = 0; - __atomic_fetch_add( &cltr->ready.sleep.wakes , proc->ready.sleep.wakes , __ATOMIC_SEQ_CST ); proc->ready.sleep.wakes = 0; - __atomic_fetch_add( &cltr->ready.sleep.exits , proc->ready.sleep.exits , __ATOMIC_SEQ_CST ); proc->ready.sleep.exits = 0; + tally_one( &cltr->ready.push.local.attempt, &proc->ready.push.local.attempt ); + tally_one( &cltr->ready.push.local.success, &proc->ready.push.local.success ); + tally_one( &cltr->ready.push.share.attempt, &proc->ready.push.share.attempt ); + tally_one( &cltr->ready.push.share.success, &proc->ready.push.share.success ); + tally_one( &cltr->ready.push.extrn.attempt, &proc->ready.push.extrn.attempt ); + tally_one( &cltr->ready.push.extrn.success, &proc->ready.push.extrn.success ); + tally_one( &cltr->ready.pop.local .attempt, &proc->ready.pop.local .attempt ); + tally_one( &cltr->ready.pop.local .success, &proc->ready.pop.local .success ); + tally_one( &cltr->ready.pop.local .elock , &proc->ready.pop.local .elock ); + tally_one( &cltr->ready.pop.local .eempty , &proc->ready.pop.local .eempty ); + tally_one( &cltr->ready.pop.local .espec , &proc->ready.pop.local .espec ); + tally_one( &cltr->ready.pop.help .attempt, &proc->ready.pop.help .attempt ); + tally_one( &cltr->ready.pop.help .success, &proc->ready.pop.help .success ); + tally_one( &cltr->ready.pop.help .elock , &proc->ready.pop.help .elock ); + tally_one( &cltr->ready.pop.help .eempty , &proc->ready.pop.help .eempty ); + tally_one( &cltr->ready.pop.help .espec , &proc->ready.pop.help .espec ); + tally_one( &cltr->ready.pop.steal .attempt, &proc->ready.pop.steal .attempt ); + tally_one( &cltr->ready.pop.steal .success, &proc->ready.pop.steal .success ); + tally_one( &cltr->ready.pop.steal .elock , &proc->ready.pop.steal .elock ); + tally_one( &cltr->ready.pop.steal .eempty , &proc->ready.pop.steal .eempty ); + tally_one( &cltr->ready.pop.steal .espec , &proc->ready.pop.steal .espec ); + tally_one( &cltr->ready.pop.search.attempt, &proc->ready.pop.search.attempt ); + tally_one( &cltr->ready.pop.search.success, &proc->ready.pop.search.success ); + tally_one( &cltr->ready.pop.search.elock , &proc->ready.pop.search.elock ); + tally_one( &cltr->ready.pop.search.eempty , &proc->ready.pop.search.eempty ); + tally_one( &cltr->ready.pop.search.espec , &proc->ready.pop.search.espec ); + tally_one( &cltr->ready.threads.migration , &proc->ready.threads.migration ); + tally_one( &cltr->ready.threads.extunpark , &proc->ready.threads.extunpark ); + tally_one( &cltr->ready.threads.threads , &proc->ready.threads.threads ); + tally_one( &cltr->ready.sleep.halts , &proc->ready.sleep.halts ); + tally_one( &cltr->ready.sleep.cancels , &proc->ready.sleep.cancels ); + tally_one( &cltr->ready.sleep.wakes , &proc->ready.sleep.wakes ); + tally_one( &cltr->ready.sleep.exits , &proc->ready.sleep.exits ); #if defined(CFA_HAVE_LINUX_IO_URING_H) - __atomic_fetch_add( &cltr->io.alloc.fast , proc->io.alloc.fast , __ATOMIC_SEQ_CST ); proc->io.alloc.fast = 0; - __atomic_fetch_add( &cltr->io.alloc.slow , proc->io.alloc.slow , __ATOMIC_SEQ_CST ); proc->io.alloc.slow = 0; - __atomic_fetch_add( &cltr->io.alloc.fail , proc->io.alloc.fail , __ATOMIC_SEQ_CST ); proc->io.alloc.fail = 0; - __atomic_fetch_add( &cltr->io.alloc.revoke , proc->io.alloc.revoke , __ATOMIC_SEQ_CST ); proc->io.alloc.revoke = 0; - __atomic_fetch_add( &cltr->io.alloc.block , proc->io.alloc.block , __ATOMIC_SEQ_CST ); proc->io.alloc.block = 0; - __atomic_fetch_add( &cltr->io.submit.fast , proc->io.submit.fast , __ATOMIC_SEQ_CST ); proc->io.submit.fast = 0; - __atomic_fetch_add( &cltr->io.submit.slow , proc->io.submit.slow , __ATOMIC_SEQ_CST ); proc->io.submit.slow = 0; - __atomic_fetch_add( &cltr->io.flush.external , proc->io.flush.external , __ATOMIC_SEQ_CST ); proc->io.flush.external = 0; - __atomic_fetch_add( &cltr->io.calls.flush , proc->io.calls.flush , __ATOMIC_SEQ_CST ); proc->io.calls.flush = 0; - __atomic_fetch_add( &cltr->io.calls.submitted , proc->io.calls.submitted , __ATOMIC_SEQ_CST ); proc->io.calls.submitted = 0; - __atomic_fetch_add( &cltr->io.calls.drain , proc->io.calls.drain , __ATOMIC_SEQ_CST ); proc->io.calls.drain = 0; - __atomic_fetch_add( &cltr->io.calls.completed , proc->io.calls.completed , __ATOMIC_SEQ_CST ); proc->io.calls.completed = 0; - __atomic_fetch_add( &cltr->io.calls.errors.busy, proc->io.calls.errors.busy, __ATOMIC_SEQ_CST ); proc->io.calls.errors.busy = 0; - __atomic_fetch_add( &cltr->io.poller.sleeps , proc->io.poller.sleeps , __ATOMIC_SEQ_CST ); proc->io.poller.sleeps = 0; + tally_one( &cltr->io.alloc.fast , &proc->io.alloc.fast ); + tally_one( &cltr->io.alloc.slow , &proc->io.alloc.slow ); + tally_one( &cltr->io.alloc.fail , &proc->io.alloc.fail ); + tally_one( &cltr->io.alloc.revoke , &proc->io.alloc.revoke ); + tally_one( &cltr->io.alloc.block , &proc->io.alloc.block ); + tally_one( &cltr->io.submit.fast , &proc->io.submit.fast ); + tally_one( &cltr->io.submit.slow , &proc->io.submit.slow ); + tally_one( &cltr->io.flush.external , &proc->io.flush.external ); + tally_one( &cltr->io.calls.flush , &proc->io.calls.flush ); + tally_one( &cltr->io.calls.submitted , &proc->io.calls.submitted ); + tally_one( &cltr->io.calls.drain , &proc->io.calls.drain ); + tally_one( &cltr->io.calls.completed , &proc->io.calls.completed ); + tally_one( &cltr->io.calls.errors.busy, &proc->io.calls.errors.busy ); + tally_one( &cltr->io.poller.sleeps , &proc->io.poller.sleeps ); #endif } Index: libcfa/src/containers/list.hfa =================================================================== --- libcfa/src/containers/list.hfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/containers/list.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -18,333 +18,279 @@ #include -#define __DLISTED_MGD_COMMON(ELEM, NODE, LINKS_FLD) \ -static inline ELEM& $tempcv_n2e(NODE &node) { \ - return node; \ -} \ -\ -static inline NODE& $tempcv_e2n(ELEM &node) { \ - return ( NODE & ) node; \ -} \ -\ -static inline ELEM & ?`prev(NODE &node) { \ - $dlinks(ELEM) & ls = node.LINKS_FLD; \ - $mgd_link(ELEM) * l = &ls.prev; \ - ELEM * e = l->elem; \ - return *e; \ -} \ -\ -static inline ELEM & ?`next(NODE &node) { \ - $dlinks(ELEM) & ls = node.LINKS_FLD; \ - $mgd_link(ELEM) * l = &ls.next; \ - ELEM * e = l->elem; \ - return *e; \ -} \ -\ -static inline $mgd_link(ELEM) & $prev_link(NODE &node) { \ - $dlinks(ELEM) & ls = node.LINKS_FLD; \ - $mgd_link(ELEM) * l = &ls.prev; \ - return *l; \ -} \ -\ -static inline $mgd_link(ELEM) & $next_link(NODE &node) { \ - $dlinks(ELEM) & ls = node.LINKS_FLD; \ - $mgd_link(ELEM) * l = &ls.next; \ - return *l; \ +forall( Decorator &, T & ) +struct tytagref { + inline T &; +}; + +trait embedded( tOuter &, tMid &, tInner & ) { + tytagref( tMid, tInner ) ?`inner( tOuter & ); +}; + +// embedded is reflexive, with no info (void) as the type tag +forall (T &) +static inline tytagref(void, T) ?`inner ( T & this ) { tytagref( void, T ) ret = {this}; return ret; } + +// use this on every case of plan-9 inheritance, to make embedded a closure of plan-9 inheritance +#define P9_EMBEDDED( derived, immedBase ) \ +forall( Tbase &, TdiscardPath & | { tytagref( TdiscardPath, Tbase ) ?`inner( immedBase & ); } ) \ + static inline tytagref(immedBase, Tbase) ?`inner( derived & this ) { \ + immedBase & ib = this; \ + Tbase & b = ib`inner; \ + tytagref(immedBase, Tbase) result = { b }; \ + return result; \ + } + +#define EMBEDDED_VIA( OUTER, MID, INNER ) \ + (struct { tytagref(MID, INNER) ( * ?`inner ) ( OUTER & ); }){ ?`inner } + +#define DLINK_VIA( TE, TLINK ) \ + EMBEDDED_VIA( TE, TLINK, dlink(TE) ) + + +// The origin is the position encountered at the start of iteration, +// signifying, "need to advance to the first element," and at the end +// of iteration, signifying, "no more elements." Normal comsumption of +// an iterator runs ?`moveNext as the first step, and uses the return +// of ?`moveNext as a guard, before dereferencing the iterator. So +// normal consumption of an iterator does not dereference an iterator +// in origin position. The value of a pointer (underlying a refence) +// that is exposed publicly as an iteraor, and also a pointer stored +// internally in a link field, is tagged, to indicate "is the origin" +// (internally, is the list-head sentinel node), or untagged, to indicate +// "is a regular node." Intent is to help a user who dereferences an +// iterator in origin position (which would be an API-use error on their +// part), by failing fast. + +#if defined( __x86_64 ) + // Preferred case: tag in the most-significant bit. Dereference + // has been shown to segfault consistently. Maintenance should + // list more architectures as "ok" here, to let them use the + // preferred case, when valid. + #define ORIGIN_TAG_BITNO ( 8 * sizeof( size_t ) - 1 ) +#else + // Fallback case: tag in the least-significant bit. Dereference + // will often give an alignment error, but may not, e.g. if + // accessing a char-typed member. 32-bit x86 uses the most- + // significant bit for real room on the heap. + #define ORIGIN_TAG_BITNO 0 +#endif +#define ORIGIN_TAG_MASK (((size_t)1) << ORIGIN_TAG_BITNO) + +#define ORIGIN_TAG_SET(p) ((p) | ORIGIN_TAG_MASK) +#define ORIGIN_TAG_CLEAR(p) ((p) & ~ORIGIN_TAG_MASK) +#define ORIGIN_TAG_QUERY(p) ((p) & ORIGIN_TAG_MASK) + + +forall( tE & ) { + + struct dlink{ + tE *next; + tE *prev; + }; + + static inline void ?{}( dlink(tE) & this ) { + this.next = 0p; + this.prev = 0p; + } + + forall( tLinks & = dlink(tE) ) + struct dlist { + inline dlink(tE); + }; + + forall( tLinks & | embedded( tE, tLinks, dlink(tE) ) ) { + static inline tE * $get_list_origin_addr( dlist(tE, tLinks) & lst ) { + dlink(tE) & link_from_null = ( * (tE *) 0p )`inner; + ptrdiff_t link_offset = (ptrdiff_t) & link_from_null; + size_t origin_addr = ((size_t) & lst) - link_offset; + size_t preResult = ORIGIN_TAG_SET( origin_addr ); + return (tE *)preResult; + } + + static inline void ?{}( dlist(tE, tLinks) & this ) { + tE * listOrigin = $get_list_origin_addr( this ); + ( ( dlink(tE) & ) this ){ listOrigin, listOrigin } ; + } + } + } -#define __DLISTED_MGD_JUSTEXPL(STRUCT, IN_THELIST, STRUCT_IN_THELIST) \ -struct STRUCT_IN_THELIST { \ - inline STRUCT; \ -}; \ -\ -void ?{}(STRUCT_IN_THELIST &) = void; \ -\ -static inline STRUCT_IN_THELIST& ?`IN_THELIST(STRUCT &this) { \ - return (STRUCT_IN_THELIST&)this; \ -} - -#define __DLISTED_MGD_JUSTIMPL(STRUCT) - -forall( tE & ) { - struct $mgd_link { - tE *elem; - void *terminator; - _Bool is_terminator; - // will collapse to single pointer with tag bit - }; - static inline void ?{}( $mgd_link(tE) &this, tE* elem ) { - (this.elem){ elem }; - (this.terminator){ 0p }; - (this.is_terminator){ 0 }; - } - static inline void ?{}( $mgd_link(tE) &this, void * terminator ) { - (this.elem){ 0p }; - (this.terminator){ terminator }; - (this.is_terminator){ 1 }; - } - static inline void ?=?( $mgd_link(tE) &this, tE* elem ) { - this.elem = elem ; - this.terminator = 0p; - this.is_terminator = 0; - } - static inline void ?=?( $mgd_link(tE) &this, void * terminator ) { - this.elem = 0p; - this.terminator = terminator; - this.is_terminator = 1; - } - struct $dlinks { - // containing item is not listed - // iff - // links have (elem == 0p && terminator == 0p) - $mgd_link(tE) next; - $mgd_link(tE) prev; - }; - static inline void ?{}( $dlinks(tE) &this ) { - (this.next){ (tE *)0p }; - (this.prev){ (tE *)0p }; - } -} - -#define DLISTED_MGD_EXPL_IN(STRUCT, LIST_SUF) \ - $dlinks(STRUCT) $links_ ## LIST_SUF; - -#define DLISTED_MGD_EXPL_OUT(STRUCT, LIST_SUF) \ - __DLISTED_MGD_JUSTEXPL(STRUCT, in_##LIST_SUF, STRUCT ## _in_ ## LIST_SUF) \ - __DLISTED_MGD_COMMON(STRUCT, STRUCT##_in_##LIST_SUF, $links_ ## LIST_SUF) - -#define DLISTED_MGD_IMPL_IN(STRUCT) \ - $dlinks(STRUCT) $links; - -#define DLISTED_MGD_IMPL_OUT(STRUCT) \ - __DLISTED_MGD_JUSTIMPL(STRUCT) \ - __DLISTED_MGD_COMMON(STRUCT, STRUCT, $links) - -trait $dlistable(Tnode &, Telem &) { - $mgd_link(Telem) & $prev_link(Tnode &); - $mgd_link(Telem) & $next_link(Tnode &); - Telem& $tempcv_n2e(Tnode &); - Tnode& $tempcv_e2n(Telem &); - - Telem& ?`next(Tnode &); - Telem& ?`prev(Tnode &); -}; - -forall (Tnode &, Telem & | $dlistable(Tnode, Telem)) { - - // implemented as a sentinel item in an underlying cicrular list - // theList.$links.next is first - // theList.$links.prev is last - // note this allocation preserves prev-next composition as an identity - struct dlist { - $dlinks(Telem) $links; - }; - - // an empty dlist - // links refer to self, making a tight circle - static inline void ?{}( dlist(Tnode, Telem) & this ) { - $mgd_link(Telem) selfRef = (void *) &this; - ( this.$links ) { selfRef, selfRef }; - } - - static inline Telem & ?`first( dlist(Tnode, Telem) &l ) { - return * l.$links.next.elem; - } - - static inline Telem & ?`last( dlist(Tnode, Telem) &l ) { - return * l.$links.prev.elem; - } - - #if !defined(NDEBUG) && (defined(__CFA_DEBUG__) || defined(__CFA_VERIFY__)) - static bool $validate_fwd( dlist(Tnode, Telem) & this ) { - Tnode * it = & $tempcv_e2n( this`first ); - if (!it) return (& this`last == 0p); - - while( $next_link(*it).elem ) { - it = & $tempcv_e2n( * $next_link(*it).elem ); - } - - return ( it == & $tempcv_e2n( this`last ) ) && - ( $next_link(*it).is_terminator ) && - ( ((dlist(Tnode, Telem)*)$next_link(*it).terminator) == &this ); - } - static bool $validate_rev( dlist(Tnode, Telem) & this ) { - Tnode * it = & $tempcv_e2n( this`last ); - if (!it) return (& this`first == 0p); - - while( $prev_link(*it).elem ) { - it = & $tempcv_e2n( * $prev_link(*it).elem ); - } - - return ( it == & $tempcv_e2n( this`first ) ) && - ( $prev_link(*it).is_terminator ) && - ( ((dlist(Tnode, Telem)*)$prev_link(*it).terminator) == &this ); - } - static bool validate( dlist(Tnode, Telem) & this ) { - return $validate_fwd(this) && $validate_rev(this); - } - #endif - - static inline void insert_after(Tnode &list_pos, Telem &to_insert) { + +forall( tE &, tLinks & | embedded( tE, tLinks, dlink(tE) ) ) { + + static inline void insert_after(tE & list_pos, tE &to_insert) { verify (&list_pos != 0p); verify (&to_insert != 0p); - Tnode &singleton_to_insert = $tempcv_e2n(to_insert); - verify($prev_link(singleton_to_insert).elem == 0p); - verify($next_link(singleton_to_insert).elem == 0p); - $prev_link(singleton_to_insert) = & $tempcv_n2e(list_pos); - $next_link(singleton_to_insert) = $next_link(list_pos); - if ($next_link(list_pos).is_terminator) { - dlist(Tnode, Telem) *list = ( dlist(Tnode, Telem) * ) $next_link(list_pos).terminator; - $dlinks(Telem) *list_links = & list->$links; - $mgd_link(Telem) *list_last = & list_links->prev; - *list_last = &to_insert; - } else { - Telem *list_pos_next = $next_link(list_pos).elem; - if (list_pos_next) { - Tnode & lpn_inlist = $tempcv_e2n(*list_pos_next); - $prev_link(lpn_inlist) = &to_insert; - } - } - $next_link(list_pos) = &to_insert; - } - - static inline void insert_before(Tnode &list_pos, Telem &to_insert) { + dlink(tE) & linkToInsert = to_insert`inner; + verify(linkToInsert.prev == 0p); + verify(linkToInsert.next == 0p); + tE & list_pos_raw = list_pos; + tE & list_pos_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & list_pos_raw ); + dlink(tE) & list_pos_links = list_pos_elem`inner; + asm( "" : : : "memory" ); + tE & after_raw = * list_pos_links.next; + tE & after_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & after_raw ); + linkToInsert.prev = & list_pos_raw; + linkToInsert.next = & after_raw; + dlink(tE) & afterLinks = after_elem`inner; + afterLinks.prev = &to_insert; + list_pos_links.next = &to_insert; + asm( "" : : : "memory" ); + } + + static inline void insert_before(tE & list_pos, tE &to_insert) { verify (&list_pos != 0p); verify (&to_insert != 0p); - Tnode &singleton_to_insert = $tempcv_e2n(to_insert); - verify($prev_link(singleton_to_insert).elem == 0p); - verify($next_link(singleton_to_insert).elem == 0p); - $next_link(singleton_to_insert) = & $tempcv_n2e(list_pos); - $prev_link(singleton_to_insert) = $prev_link(list_pos); - if ($prev_link(list_pos).is_terminator) { - dlist(Tnode, Telem) *list = ( dlist(Tnode, Telem) * ) $prev_link(list_pos).terminator; - $dlinks(Telem) *list_links = & list->$links; - $mgd_link(Telem) *list_first = & list_links->next; - *list_first = &to_insert; - } else { - Telem *list_pos_prev = $prev_link(list_pos).elem; - if (list_pos_prev) { - Tnode & lpp_inlist = $tempcv_e2n(*list_pos_prev); - $next_link(lpp_inlist) = &to_insert; - } - } - $prev_link(list_pos) = &to_insert; - } - - static inline void insert_first(dlist(Tnode, Telem) &list, Telem &to_insert) { - verify (&list != 0p); - verify (&to_insert != 0p); - Tnode &singleton_to_insert = $tempcv_e2n(to_insert); - verify($prev_link(singleton_to_insert).elem == 0p); - verify($next_link(singleton_to_insert).elem == 0p); - - $prev_link(singleton_to_insert) = (void*) &list; - $next_link(singleton_to_insert) = list.$links.next; - - $dlinks(Telem) *listLinks = & list.$links; - if (listLinks->next.is_terminator) { - $mgd_link(Telem) * listPrevReference = & listLinks->prev; - *listPrevReference = &to_insert; - } else { - Tnode & next_inlist = $tempcv_e2n(*list.$links.next.elem); - $prev_link(next_inlist) = &to_insert; - } - $mgd_link(Telem) * listNextReference = & listLinks->next; - *listNextReference = &to_insert; - } - - static inline void insert_last(dlist(Tnode, Telem) &list, Telem &to_insert) { - verify (&list != 0p); - verify (&to_insert != 0p); - Tnode &singleton_to_insert = $tempcv_e2n(to_insert); - verify($next_link(singleton_to_insert).elem == 0p); - verify($prev_link(singleton_to_insert).elem == 0p); - - $next_link(singleton_to_insert) = (void*) &list; - $prev_link(singleton_to_insert) = list.$links.prev; - - $dlinks(Telem) *listLinks = & list.$links; - if (listLinks->prev.is_terminator) { - $mgd_link(Telem) * listNextReference = & listLinks->next; - *listNextReference = &to_insert; - } else { - Tnode & prev_inlist = $tempcv_e2n(*list.$links.prev.elem); - $next_link(prev_inlist) = &to_insert; - } - $mgd_link(Telem) * listPrevReference = & listLinks->prev; - *listPrevReference = &to_insert; - } - - static inline void remove(Tnode &list_pos) { - verify( &list_pos != 0p ); - - $mgd_link(Telem) &incoming_from_prev = *0p; - $mgd_link(Telem) &incoming_from_next = *0p; - - if ( $prev_link(list_pos).is_terminator ) { - dlist(Tnode, Telem) * tgt_before = ( dlist(Tnode, Telem) * ) $prev_link(list_pos).terminator; - $dlinks(Telem) * links_before = & tgt_before->$links; - &incoming_from_prev = & links_before->next; - } else if ($prev_link(list_pos).elem) { - Telem * tgt_before = $prev_link(list_pos).elem; - Tnode & list_pos_before = $tempcv_e2n(*tgt_before); - &incoming_from_prev = & $next_link(list_pos_before); - } - - if ( $next_link(list_pos).is_terminator ) { - dlist(Tnode, Telem) * tgt_after = ( dlist(Tnode, Telem) * ) $next_link(list_pos).terminator; - $dlinks(Telem) * links_after = & tgt_after->$links; - &incoming_from_next = & links_after->prev; - } else if ($next_link(list_pos).elem) { - Telem * tgt_after = $next_link(list_pos).elem; - Tnode & list_pos_after = $tempcv_e2n(*tgt_after ); - &incoming_from_next = & $prev_link(list_pos_after ); - } - - if (& incoming_from_prev) { - incoming_from_prev = $next_link(list_pos); - } - if (& incoming_from_next) { - incoming_from_next = $prev_link(list_pos); - } - - $next_link(list_pos) = (Telem*) 0p; - $prev_link(list_pos) = (Telem*) 0p; - } - - static inline bool ?`is_empty(dlist(Tnode, Telem) &list) { - verify( &list != 0p ); - $dlinks(Telem) *listLinks = & list.$links; - if (listLinks->next.is_terminator) { - verify(listLinks->prev.is_terminator); - verify(listLinks->next.terminator); - verify(listLinks->prev.terminator); - return true; - } else { - verify(!listLinks->prev.is_terminator); - verify(listLinks->next.elem); - verify(listLinks->prev.elem); - return false; - } - } - - static inline Telem & pop_first(dlist(Tnode, Telem) &list) { - verify( &list != 0p ); - verify( !list`is_empty ); - $dlinks(Telem) *listLinks = & list.$links; - Telem & first = *listLinks->next.elem; - Tnode & list_pos_first = $tempcv_e2n( first ); - remove(list_pos_first); - return first; - } - - static inline Telem & pop_last(dlist(Tnode, Telem) &list) { - verify( &list != 0p ); - verify( !list`is_empty ); - $dlinks(Telem) *listLinks = & list.$links; - Telem & last = *listLinks->prev.elem; - Tnode & list_pos_last = $tempcv_e2n( last ); - remove(list_pos_last); - return last; - } + dlink(tE) & linkToInsert = to_insert`inner; + verify(linkToInsert.next == 0p); + verify(linkToInsert.prev == 0p); + tE & list_pos_raw = list_pos; + tE & list_pos_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & list_pos_raw ); + dlink(tE) & list_pos_links = list_pos_elem`inner; + asm( "" : : : "memory" ); + tE & before_raw = * (list_pos_links).prev; + tE & before_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & before_raw ); + linkToInsert.next = & list_pos_raw; + linkToInsert.prev = & before_raw; + dlink(tE) & beforeLinks = before_elem`inner; + beforeLinks.next = &to_insert; + (list_pos_links).prev = &to_insert; + asm( "" : : : "memory" ); + } + + static inline tE & remove(tE & list_pos) { + verify (&list_pos != 0p); + tE & list_pos_elem = list_pos; + verify( ! ORIGIN_TAG_QUERY((size_t) & list_pos_elem) ); + dlink(tE) & list_pos_links = list_pos_elem`inner; + tE & before_raw = * list_pos_links.prev; + tE & before_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & before_raw ); + dlink(tE) & before_links = before_elem`inner; + tE & after_raw = * list_pos_links.next; + tE & after_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & after_raw ); + dlink(tE) & after_links = after_elem`inner; + before_links.next = &after_raw; + after_links.prev = &before_raw; + asm( "" : : : "memory" ); + list_pos_links.prev = 0p; + list_pos_links.next = 0p; + asm( "" : : : "memory" ); + return list_pos_elem; + } + + static inline tE & ?`first( dlist(tE, tLinks) &lst ) { + tE * firstPtr = lst.next; + if (ORIGIN_TAG_QUERY((size_t)firstPtr)) firstPtr = 0p; + return *firstPtr; + } + static inline tE & ?`last ( dlist(tE, tLinks) &lst ) { + tE * lastPtr = lst.prev; + if (ORIGIN_TAG_QUERY((size_t)lastPtr)) lastPtr = 0p; + return *lastPtr; + } + + static inline bool ?`isEmpty( dlist(tE, tLinks) & lst ) { + tE * firstPtr = lst.next; + if (ORIGIN_TAG_QUERY((size_t)firstPtr)) firstPtr = 0p; + return firstPtr == 0p; + } + + static inline tE & ?`elems( dlist(tE, tLinks) & lst ) { + tE * origin = $get_list_origin_addr( lst ); + return *origin; + } + + static inline bool ?`moveNext( tE && refx ) { + tE && ref_inner = refx; + tE & oldReferent = * (tE*) ORIGIN_TAG_CLEAR( (size_t) & ref_inner ); + &ref_inner = oldReferent`inner.next; + return &ref_inner != 0p && + ! ORIGIN_TAG_QUERY( (size_t) & ref_inner ); + } + + static inline bool ?`movePrev( tE && refx ) { + tE && ref_inner = refx; + tE & oldReferent = * (tE*) ORIGIN_TAG_CLEAR( (size_t) & ref_inner ); + &ref_inner = oldReferent`inner.prev; + return &ref_inner != 0p && + ! ORIGIN_TAG_QUERY( (size_t) & ref_inner ); + } + + static inline bool ?`hasNext( tE & e ) { + return e`moveNext; + } + + static inline bool ?`hasPrev( tE & e ) { + return e`movePrev; + } + + static inline tE & ?`next( tE & e ) { + if( e`moveNext ) return e; + return * 0p; + } + + static inline tE & ?`prev( tE & e ) { + if( e`movePrev ) return e; + return * 0p; + } + + static inline void insert_first( dlist(tE, tLinks) &lst, tE & e ) { + insert_after(lst`elems, e); + } + + static inline void insert_last( dlist(tE, tLinks) &lst, tE & e ) { + insert_before(lst`elems, e); + } + + static inline tE & try_pop_front( dlist(tE, tLinks) &lst ) { + tE & first_inlist = lst`first; + tE & first_item = first_inlist; + if (&first_item) remove(first_inlist); + return first_item; + } + + static inline tE & try_pop_back( dlist(tE, tLinks) &lst ) { + tE & last_inlist = lst`last; + tE & last_item = last_inlist; + if (&last_item) remove(last_inlist); + return last_item; + } + + + #if !defined(NDEBUG) && (defined(__CFA_DEBUG__) || defined(__CFA_VERIFY__)) + static bool $validate_fwd( dlist(tE, tLinks) & this ) { + if ( ! & this`first ) return ( (& this`last) == 0p); + + tE & lagElem = *0p; + + while ( tE & it = this`elems; it`moveNext ) { + if (& lagElem == 0p && &it != & this`first ) return false; + & lagElem = & it; + } + + if (& lagElem != & this`last) return false; + + // TODO: verify that it is back at this`elems; + return true; + } + static bool $validate_rev( dlist(tE, tLinks) & this ) { + if ( ! & this`last ) return ( (& this`first) == 0p); + + tE & lagElem = *0p; + + while ( tE & it = this`elems; it`movePrev ) { + if (& lagElem == 0p && &it != & this`last ) return false; + & lagElem = & it; + } + + if (& lagElem != & this`first) return false; + + // TODO: verify that it is back at this`elems; + return true; + } + static bool validate( dlist(tE, tLinks) & this ) { + return $validate_fwd(this) && $validate_rev(this); + } + #endif } Index: libcfa/src/exception.hfa =================================================================== --- libcfa/src/exception.hfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/exception.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -162,5 +162,5 @@ // Generate a new type-id value. #define _EHM_TYPE_ID_VALUE(exception_name, arguments) \ - __attribute__(( section(".gnu.linkonce." "__cfatid_" #exception_name) )) \ + __attribute__((cfa_linkonce)) \ _EHM_TYPE_ID_TYPE(exception_name) arguments const \ _EHM_TYPE_ID_NAME(exception_name) = { \ Index: libcfa/src/executor.baseline.txt =================================================================== --- libcfa/src/executor.baseline.txt (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ libcfa/src/executor.baseline.txt (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,165 @@ +// Mutex buffer is embedded in the nomutex executor to allow the executor to delete the workers without causing a +// deadlock. If the executor is the monitor and the buffer is class, the thread calling the executor's destructor +// (which is mutex) blocks when deleting the workers, preventing outstanding workers from calling remove to drain the +// buffer. + +#include +#include + +forall( T & | $dlistable(T, T) ) { + monitor Buffer { // unbounded buffer + dlist( T, T ) queue; // unbounded list of work requests + condition delay; + }; // Buffer + + void insert( Buffer(T) & mutex buf, T * elem ) with(buf) { + dlist( T, T ) * qptr = &queue; // workaround https://cforall.uwaterloo.ca/trac/ticket/166 + insert_last( *qptr, *elem ); // insert element into buffer + signal( delay ); // restart + } // insert + + T * remove( Buffer(T) & mutex buf ) with(buf) { + dlist( T, T ) * qptr = &queue; // workaround https://cforall.uwaterloo.ca/trac/ticket/166 + // if ( (*qptr)`is_empty ) wait( delay ); // no request to process ? => wait + if ( (*qptr)`is_empty ) return 0p; // no request to process ? => wait + return &pop_first( *qptr ); + } // remove +} // forall + +struct WRequest { // client request, no return + void (* action)( void ); + DLISTED_MGD_IMPL_IN(WRequest) +}; // WRequest +DLISTED_MGD_IMPL_OUT(WRequest) + +void ?{}( WRequest & req ) with(req) { action = 0; } +void ?{}( WRequest & req, void (* action)( void ) ) with(req) { req.action = action; } +bool stop( WRequest & req ) { return req.action == 0; } +void doit( WRequest & req ) { req.action(); } + +// Each worker has its own set (when requests buffers > workers) of work buffers to reduce contention between client +// and server, where work requests arrive and are distributed into buffers in a roughly round-robin order. + +thread Worker { + Buffer(WRequest) * requests; + WRequest * request; + unsigned int start, range; +}; // Worker + +void main( Worker & w ) with(w) { + for ( int i = 0;; i = (i + 1) % range ) { + request = remove( requests[i + start] ); + if ( ! request ) { yield(); continue; } + if ( stop( *request ) ) break; + doit( *request ); + delete( request ); + } // for +} // Worker::main + +void ?{}( Worker & worker, cluster * wc, Buffer(WRequest) * requests, unsigned int start, unsigned int range ) { + ((thread &)worker){ *wc }; + worker.[requests, request, start, range] = [requests, ((WRequest *) 0), start, range]; +} // ?{} + +WRequest * current_request( Worker & worker ) { return worker.request; } + +struct Executor { + cluster * cluster; // if workers execute on separate cluster + processor ** processors; // array of virtual processors adding parallelism for workers + Buffer(WRequest) * requests; // list of work requests + Worker ** workers; // array of workers executing work requests + unsigned int nprocessors, nworkers, nrqueues; // number of processors/threads/request queues + bool sepClus; // use same or separate cluster for executor + unsigned int next; // demultiplexed across worker buffers +}; // Executor + +unsigned int tickets( Executor & ex ) with(ex) { + //return uFetchAdd( next, 1 ) % nrqueues; + return next++ % nrqueues; // no locking, interference randomizes +} // tickets + +void ?{}( Executor & ex, unsigned int np, unsigned int nw, unsigned int nr, bool sc = false ) with(ex) { + [nprocessors, nworkers, nrqueues, sepClus] = [np, nw, nr, sc]; + assert( nrqueues >= nworkers ); + cluster = 0p; + processors = aalloc( nprocessors ); + requests = anew( nrqueues ); + workers = aalloc( nworkers ); + + for ( i; nprocessors ) { + processors[i] = new( *cluster ); + } // for + + unsigned int reqPerWorker = nrqueues / nworkers, extras = nrqueues % nworkers; +// for ( unsigned int i = 0, start = 0, range; i < nworkers; i += 1, start += range ) { + for ( i; nworkers : start; 0u ~ @ ~ range : range; ) { + range = reqPerWorker + ( i < extras ? 1 : 0 ); + workers[i] = new( cluster, requests, start, range ); + } // for +} // ?{} + +void ?{}( Executor & ex, unsigned int nprocessors, unsigned int nworkers, bool sepClus = false ) { + ex{ nprocessors, nworkers, nworkers, sepClus }; +} +void ?{}( Executor & ex, unsigned int nprocessors, bool sepClus = false ) { + ex{ nprocessors, nprocessors, nprocessors, sepClus }; +} +void ?{}( Executor & ex ) { // special for current cluster, no processors added + ex{ 0, 5, false }; +} +void ^?{}( Executor & ex ) with(ex) { + // Add one sentinel per worker to stop them. Since in destructor, no new external work should be queued. Cannot + // combine next two loops and only have a single sentinel because workers arrive in arbitrary order, so worker1 may + // take the single sentinel while waiting for worker 0 to end. + + WRequest sentinel[nworkers]; + unsigned int reqPerWorker = nrqueues / nworkers; + for ( unsigned int i = 0, step = 0; i < nworkers; i += 1, step += reqPerWorker ) { + insert( requests[step], &sentinel[i] ); // force eventually termination + } // for + for ( i; nworkers ) { + delete( workers[i] ); + } // for + for ( i; nprocessors ) { + delete( processors[i] ); + } // for + + free( workers ); +// adelete( nrqueues, requests ); + for ( i; nrqueues ) ^?{}( requests[i] ); // FIX ME: problem with resolver + free( requests ); + free( processors ); + if ( sepClus ) { delete( cluster ); } +} // ^?{} + +void send( Executor & ex, void (* action)( void ) ) { // asynchronous call, no return value + WRequest * node = new( action ); + insert( ex.requests[tickets( ex )], node ); +} // send + + +int counter = 0; + +void work( void ) { + __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST ); + // fprintf( stderr, "workie\n" ); +} + +int main( int argc, char * argv[] ) { + int times = 1_000_000; + if ( argc == 2 ) times = atoi( argv[1] ); + processor p[7]; + { + Executor exector; + for ( i; times ) { + send( exector, work ); + if ( i % 100 == 0 ) yield(); + } // for + } + printf( "%d\n", counter ); +} + +// Local Variables: // +// tab-width: 4" // +// compile-command: "cfa executor.cfa" // +// End: // Index: libcfa/src/executor.cfa =================================================================== --- libcfa/src/executor.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/executor.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -7,21 +7,21 @@ #include -forall( T & | $dlistable(T, T) ) { +forall( T &, TLink& = dlink(T) | embedded(T, TLink, dlink(T)) ) { monitor Buffer { // unbounded buffer - dlist( T, T ) queue; // unbounded list of work requests + dlist( T, TLink ) queue; // unbounded list of work requests condition delay; }; // Buffer - void insert( Buffer(T) & mutex buf, T * elem ) with(buf) { - dlist( T, T ) * qptr = &queue; // workaround https://cforall.uwaterloo.ca/trac/ticket/166 + void insert( Buffer(T, TLink) & mutex buf, T * elem ) with(buf) { + dlist( T, TLink ) * qptr = &queue; // workaround https://cforall.uwaterloo.ca/trac/ticket/166 insert_last( *qptr, *elem ); // insert element into buffer signal( delay ); // restart } // insert - T * remove( Buffer(T) & mutex buf ) with(buf) { - dlist( T, T ) * qptr = &queue; // workaround https://cforall.uwaterloo.ca/trac/ticket/166 - // if ( (*qptr)`is_empty ) wait( delay ); // no request to process ? => wait - if ( (*qptr)`is_empty ) return 0p; // no request to process ? => wait - return &pop_first( *qptr ); + T * remove( Buffer(T, TLink) & mutex buf ) with(buf) { + dlist( T, TLink ) * qptr = &queue; // workaround https://cforall.uwaterloo.ca/trac/ticket/166 + // if ( (*qptr)`isEmpty ) wait( delay ); // no request to process ? => wait + if ( (*qptr)`isEmpty ) return 0p; // no request to process ? => wait + return &try_pop_front( *qptr ); } // remove } // forall @@ -29,7 +29,7 @@ struct WRequest { // client request, no return void (* action)( void ); - DLISTED_MGD_IMPL_IN(WRequest) + inline dlink(WRequest); }; // WRequest -DLISTED_MGD_IMPL_OUT(WRequest) +P9_EMBEDDED(WRequest, dlink(WRequest)) void ?{}( WRequest & req ) with(req) { action = 0; } Index: libcfa/src/heap.cfa =================================================================== --- libcfa/src/heap.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/heap.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -10,6 +10,6 @@ // Created On : Tue Dec 19 21:58:35 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Apr 20 21:20:48 2021 -// Update Count : 1033 +// Last Modified On : Wed May 5 13:11:28 2021 +// Update Count : 1035 // @@ -28,5 +28,5 @@ #include "bits/locks.hfa" // __spinlock_t #include "startup.hfa" // STARTUP_PRIORITY_MEMORY -#include "math.hfa" // ceiling +#include "math.hfa" // min #include "bitmanip.hfa" // is_pow2, ceiling2 Index: libcfa/src/iostream.cfa =================================================================== --- libcfa/src/iostream.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ libcfa/src/iostream.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Apr 27 18:01:03 2021 -// Update Count : 1330 +// Last Modified On : Sat May 15 09:39:21 2021 +// Update Count : 1342 // @@ -659,7 +659,8 @@ int exp10, len2; \ eng( f.val, f.pc, exp10 ); /* changes arguments */ \ + /* printf( "%g %d %d %d %s\n", f.val, f.wd, f.pc, exp10, format ); */ \ if ( ! f.flags.left && f.wd > 1 ) { \ - /* Exponent size (number of digits, 'e', optional minus sign) */ \ - f.wd -= lrint( floor( log10( abs( exp10 ) ) ) ) + 1 + 1 + (exp10 < 0 ? 1 : 0); \ + /* Exponent size: 'e', optional minus sign, number of digits: log10(0) => undefined */ \ + f.wd -= 1 + (exp10 < 0 ? 1 : 0) + lrint( floor( exp10 == 0 ? 0 : log10( abs( exp10 ) ) ) ) + 1; \ if ( f.wd < 1 ) f.wd = 1; \ } /* if */ \ @@ -708,5 +709,5 @@ if ( ! f.flags.pc ) { /* no precision */ \ fmtstr[sizeof(DFMTNP)-2] = f.base; /* sizeof includes '\0' */ \ - /* printf( "%g %d %s\n", f.val, f.wd, &fmtstr[star]); */ \ + /* printf( "%g %d %s\n", f.val, f.wd, &fmtstr[star] ); */ \ PrintWithDP2( os, &fmtstr[star], f.wd, f.val ) \ } else { /* precision */ \ Index: src/CodeGen/LinkOnce.cc =================================================================== --- src/CodeGen/LinkOnce.cc (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ src/CodeGen/LinkOnce.cc (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,65 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2021 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// LinkOnce.cc -- Translate the cfa_linkonce attribute. +// +// Author : Andrew Beach +// Created On : Thur May 13 10:10:00 2021 +// Last Modified By : Andrew Beach +// Last Modified On : Thur May 13 14:39:00 2021 +// Update Count : 0 +// + +#include "LinkOnce.h" + +#include + +#include "Common/PassVisitor.h" // for PassVisitor, WithShortCircuiting + +namespace CodeGen { + +static bool is_cfa_linkonce( Attribute const * attr ) { + return std::string("cfa_linkonce") == attr->name; +} + +static bool is_section_attribute( Attribute const * attr ) { + return std::string("section") == attr->name; +} + +class LinkOnceVisitorCore : public WithShortCircuiting { +public: + void previsit( Declaration * ) { + visit_children = false; + } + + void previsit( DeclarationWithType * decl ) { + std::list< Attribute * > & attributes = decl->attributes; + // See if we can find the element: + auto found = std::find_if(attributes.begin(), attributes.end(), is_cfa_linkonce ); + if ( attributes.end() != found ) { + // Remove any other sections: + attributes.remove_if( is_section_attribute ); + // Iterator to the cfa_linkonce attribute should still be valid. + Attribute * attribute = *found; + assert( attribute->parameters.empty() ); + assert( !decl->mangleName.empty() ); + // Overwrite the attribute in place. + const std::string section_name = ".gnu.linkonce." + decl->mangleName; + attribute->name = "section"; + attribute->parameters.push_back( + new ConstantExpr( Constant::from_string( section_name ) ) + ); + } + visit_children = false; + } +}; + +void translateLinkOnce( std::list< Declaration *> & translationUnit ) { + PassVisitor translator; + acceptAll( translationUnit, translator ); +} + +} Index: src/CodeGen/LinkOnce.h =================================================================== --- src/CodeGen/LinkOnce.h (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ src/CodeGen/LinkOnce.h (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,34 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2021 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// LinkOnce.h -- Translate the cfa_linkonce attribute. +// +// Author : Andrew Beach +// Created On : Thur May 13 10:06:00 2021 +// Last Modified By : Andrew Beach +// Last Modified On : Thur May 13 14:38:00 2021 +// Update Count : 0 +// + +#pragma once + +// This could either be an early step in code-generation or a step of the +// Cforall to C lowering. It could also be part of attribute handling but +// for now its almost the only attribute we handle. + +#include // for list + +class Declaration; + +namespace CodeGen { + +void translateLinkOnce( std::list< Declaration *> & translationUnit ); +/* Convert the cfa_linkonce attribute on top level declaration into + * a special section declaration (.gnu.linkonce) so that it may be defined + * multiple times (same name and same type, must have the same value). + */ + +} Index: src/CodeGen/module.mk =================================================================== --- src/CodeGen/module.mk (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ src/CodeGen/module.mk (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -25,4 +25,6 @@ CodeGen/GenType.cc \ CodeGen/GenType.h \ + CodeGen/LinkOnce.cc \ + CodeGen/LinkOnce.h \ CodeGen/OperatorTable.cc \ CodeGen/OperatorTable.h \ Index: src/Concurrency/Keywords.cc =================================================================== --- src/Concurrency/Keywords.cc (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ src/Concurrency/Keywords.cc (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -432,5 +432,5 @@ new ObjectDecl( Virtual::concurrentDefaultVTableName(), - Type::Const, + noStorageClasses, LinkageSpec::Cforall, /* bitfieldWidth */ nullptr, @@ -504,5 +504,5 @@ new ObjectDecl( Virtual::concurrentDefaultVTableName(), - Type::Const, + Type::StorageClasses( Type::Extern ), LinkageSpec::Cforall, /* bitfieldWidth */ nullptr, Index: src/InitTweak/InitTweak.cc =================================================================== --- src/InitTweak/InitTweak.cc (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ src/InitTweak/InitTweak.cc (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -1216,15 +1216,13 @@ void addDataSectonAttribute( ObjectDecl * objDecl ) { - Type *strLitT = new PointerType( Type::Qualifiers( ), - new BasicType( Type::Qualifiers( ), BasicType::Char ) ); - std::list< Expression * > attr_params; - attr_params.push_back( - new ConstantExpr( Constant( strLitT, "\".data#\"", std::nullopt ) ) ); - objDecl->attributes.push_back(new Attribute("section", attr_params)); + objDecl->attributes.push_back(new Attribute("section", { + new ConstantExpr( Constant::from_string(".data#") ), + })); } void addDataSectionAttribute( ast::ObjectDecl * objDecl ) { - auto strLitT = new ast::PointerType(new ast::BasicType(ast::BasicType::Char)); - objDecl->attributes.push_back(new ast::Attribute("section", {new ast::ConstantExpr(objDecl->location, strLitT, "\".data#\"", std::nullopt)})); + objDecl->attributes.push_back(new ast::Attribute("section", { + ast::ConstantExpr::from_string(objDecl->location, ".data#"), + })); } Index: src/Virtual/Tables.cc =================================================================== --- src/Virtual/Tables.cc (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ src/Virtual/Tables.cc (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -172,11 +172,4 @@ } -Attribute * linkonce( const std::string & subsection ) { - const std::string section = ".gnu.linkonce." + subsection; - return new Attribute( "section", { - new ConstantExpr( Constant::from_string( section ) ), - } ); -} - ObjectDecl * makeTypeIdInstance( StructInstType const * typeIdType ) { assert( typeIdType ); @@ -193,5 +186,5 @@ new AddressExpr( new NameExpr( "__cfatid_exception_t" ) ) ) } ), - { linkonce( typeid_name ) }, + { new Attribute( "cfa_linkonce", {} ) }, noFuncSpecifiers ); Index: src/main.cc =================================================================== --- src/main.cc (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ src/main.cc (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -37,4 +37,5 @@ #include "CodeGen/FixNames.h" // for fixNames #include "CodeGen/Generate.h" // for generate +#include "CodeGen/LinkOnce.h" // for translateLinkOnce #include "CodeTools/DeclStats.h" // for printDeclStats #include "CodeTools/ResolvProtoDump.h" // for dumpAsResolvProto @@ -405,4 +406,8 @@ PASS( "Box", GenPoly::box( translationUnit ) ); + PASS( "Link-Once", CodeGen::translateLinkOnce( translationUnit ) ); + + // Code has been lowered to C, now we can start generation. + if ( bcodegenp ) { dump( translationUnit ); Index: tests/.expect/linkonce.txt =================================================================== --- tests/.expect/linkonce.txt (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/.expect/linkonce.txt (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,1 @@ +signed=-7 unsigned=12 Index: tests/Makefile.am =================================================================== --- tests/Makefile.am (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ tests/Makefile.am (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -67,5 +67,5 @@ .PHONY: list .validate .INTERMEDIATE: .validate .validate.cfa -EXTRA_PROGRAMS = avl_test .dummy_hack # build but do not install +EXTRA_PROGRAMS = avl_test linkonce .dummy_hack # build but do not install EXTRA_DIST = test.py \ pybin/__init__.py \ @@ -94,4 +94,5 @@ avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa +linkonce_SOURCES = link-once/main.cfa link-once/partner.cfa # automake doesn't know we still need C/CPP rules so pretend like we have a C program nodist__dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp Index: tests/array-container/array-md-sbscr-cases.cfa =================================================================== --- tests/array-container/array-md-sbscr-cases.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ tests/array-container/array-md-sbscr-cases.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -27,4 +27,15 @@ } +// Work around a compiler optimization that can lead to false failures. +// Think of `valExpected` as a constant local to each test function. +// When implemented that way, an optimization, run on some hardware, makes +// its value be off-by-a-little, compared with the values that have been +// stored-loaded (in the array under test). This effect has been observed +// on x86-32 with -O3. Declaring it as below forces the expected value +// to be stored-loaded too, which keeps the (admittedly lazily done) +// `assert(f1 == f2)` checks passing, when the intended location +// is recovered, which is the point of all these tests. +volatile float valExpected = 0.0; + // Tests all the ways to split dimensions into CFA-supported chunks, by the only order that C supports: coarsest to finest stride. forall( [Nw], [Nx], [Ny], [Nz] ) @@ -36,6 +47,7 @@ ptrdiff_t iw = 2, ix = 3, iy=4, iz=5; - const float valExpected = getMagicNumber(iw, ix, iy, iz); - assert( wxyz[iw][ix][iy][iz] == valExpected ); + valExpected = getMagicNumber(iw, ix, iy, iz); + float valGot = wxyz[iw][ix][iy][iz]; + assert( valGot == valExpected ); // order wxyz, natural split (4-0 or 0-4, no intermediate to declare) @@ -86,5 +98,5 @@ ptrdiff_t iw = 2, ix = 3, iy=4, iz=5; - const float valExpected = getMagicNumber(iw, ix, iy, iz); + valExpected = getMagicNumber(iw, ix, iy, iz); assert( wxyz[iw][ix][iy][iz] == valExpected ); @@ -108,8 +120,10 @@ // order wxzy: wx*z, y - + #if 0 + // not working on 32-bit assert(( wxyz[[iw , ix , all , iz ]][iy ] == valExpected )); assert(( wxyz[[iw , ix , all , iz-1]][iy ] != valExpected )); assert(( wxyz[[iw , ix , all , iz ]][iy-1] != valExpected )); + #endif } @@ -127,5 +141,5 @@ ptrdiff_t iw = 2, ix = 3, iy=4, iz=5; - const float valExpected = getMagicNumber(iw, ix, iy, iz); + valExpected = getMagicNumber(iw, ix, iy, iz); assert( wxyz[iw][ix][iy][iz] == valExpected ); @@ -223,5 +237,5 @@ fillHelloData(wxyz); - const float valExpected = getMagicNumber(2, 3, 4, 5); + valExpected = getMagicNumber(2, 3, 4, 5); assert(( wxyz [2] [3] [4] [5] == valExpected )); assert(( wxyz[[2, 3]][4] [5] == valExpected )); Index: tests/concurrent/.expect/sleep.txt =================================================================== --- tests/concurrent/.expect/sleep.txt (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/concurrent/.expect/sleep.txt (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,26 @@ +start +fast loop 0.047 +fast loop 0.094 +fast loop 0.141 +fast loop 0.188 +fast loop 0.235 +slow loop 0.277 +fast loop 0.282 +fast loop 0.329 +fast loop 0.376 +fast loop 0.423 +fast loop 0.47 +fast loop 0.517 +slow loop 0.554 +fast loop 0.564 +fast loop 0.611 +fast loop 0.658 +fast loop 0.705 +fast loop 0.752 +fast loop 0.799 +slow loop 0.831 +fast loop 0.846 +fast loop 0.893 +fast loop 0.94 +slow loop 1.108 +done Index: tests/concurrent/sleep.cfa =================================================================== --- tests/concurrent/sleep.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/concurrent/sleep.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,38 @@ +#include +#include +#include + +Duration default_preemption() { + return 0; +} + +thread fast_sleeper {}; +void main(fast_sleeper &) { + Duration wait = 47`ms; + for(i; 20) { + sleep(wait); + sout | acquire | "fast loop" | ((1 + i) * wait); + } +} + +thread slow_sleeper {}; +void main(slow_sleeper &) { + Duration wait = 277`ms; + for(i; 4) { + + sleep(wait); + sout | acquire | "slow loop" | ((1 + i) * wait); + } +} + +int main() { + sout | acquire | "start"; + { + slow_sleeper slow; + yield(); + fast_sleeper fast; + yield(); + } + sout | acquire | "done"; +} + Index: tests/io/.expect/manipulatorsOutput4.txt =================================================================== --- tests/io/.expect/manipulatorsOutput4.txt (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/io/.expect/manipulatorsOutput4.txt (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,226 @@ +1e-27 1e-27 +1e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 00000001e-27 +0000001e-27 01.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 +1e-26 10e-27 +10e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 00000010e-27 +0000010e-27 10.00000e-27 +10.00000e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 +1e-25 100e-27 +100e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 00000100e-27 +0000100e-27 100.00000e-27 +100.00000e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 +1e-24 1e-24 +1e-24 1e-24 +1e-24 1.00000e-24 +1.00000e-24 00000001e-24 +0000001e-24 01.00000e-24 +1.00000e-24 1e-24 +1e-24 1.00000e-24 +1.00000e-24 1e-24 +1e-24 1.00000e-24 +1.00000e-24 +1e-23 10e-24 +10e-24 10e-24 +10e-24 10.00000e-24 +10.00000e-24 00000010e-24 +0000010e-24 10.00000e-24 +10.00000e-24 10e-24 +10e-24 10.00000e-24 +10.00000e-24 10e-24 +10e-24 10.00000e-24 +10.00000e-24 +1e-22 100e-24 +100e-24 100e-24 +100e-24 100.00000e-24 +100.00000e-24 00000100e-24 +0000100e-24 100.00000e-24 +100.00000e-24 100e-24 +100e-24 100.00000e-24 +100.00000e-24 100e-24 +100e-24 100.00000e-24 +100.00000e-24 +1e-21 1e-21 +1e-21 1e-21 +1e-21 1.00000e-21 +1.00000e-21 00000001e-21 +0000001e-21 01.00000e-21 +1.00000e-21 1e-21 +1e-21 1.00000e-21 +1.00000e-21 1e-21 +1e-21 1.00000e-21 +1.00000e-21 +1e-20 10e-21 +10e-21 10e-21 +10e-21 10.00000e-21 +10.00000e-21 00000010e-21 +0000010e-21 10.00000e-21 +10.00000e-21 10e-21 +10e-21 10.00000e-21 +10.00000e-21 10e-21 +10e-21 10.00000e-21 +10.00000e-21 +1e-19 100e-21 +100e-21 100e-21 +100e-21 100.00000e-21 +100.00000e-21 00000100e-21 +0000100e-21 100.00000e-21 +100.00000e-21 100e-21 +100e-21 100.00000e-21 +100.00000e-21 100e-21 +100e-21 100.00000e-21 +100.00000e-21 +1e-18 1e-18 +1e-18 1e-18 +1e-18 1.00000e-18 +1.00000e-18 00000001e-18 +0000001e-18 01.00000e-18 +1.00000e-18 1e-18 +1e-18 1.00000e-18 +1.00000e-18 1e-18 +1e-18 1.00000e-18 +1.00000e-18 +1e-17 10e-18 +10e-18 10e-18 +10e-18 10.00000e-18 +10.00000e-18 00000010e-18 +0000010e-18 10.00000e-18 +10.00000e-18 10e-18 +10e-18 10.00000e-18 +10.00000e-18 10e-18 +10e-18 10.00000e-18 +10.00000e-18 +1e-16 100e-18 +100e-18 100e-18 +100e-18 100.00000e-18 +100.00000e-18 00000100e-18 +0000100e-18 100.00000e-18 +100.00000e-18 100e-18 +100e-18 100.00000e-18 +100.00000e-18 100e-18 +100e-18 100.00000e-18 +100.00000e-18 +1e-15 1e-15 +1e-15 1e-15 +1e-15 1.00000e-15 +1.00000e-15 00000001e-15 +0000001e-15 01.00000e-15 +1.00000e-15 1e-15 +1e-15 1.00000e-15 +1.00000e-15 1e-15 +1e-15 1.00000e-15 +1.00000e-15 +1e-14 10e-15 +10e-15 10e-15 +10e-15 10.00000e-15 +10.00000e-15 00000010e-15 +0000010e-15 10.00000e-15 +10.00000e-15 10e-15 +10e-15 10.00000e-15 +10.00000e-15 10e-15 +10e-15 10.00000e-15 +10.00000e-15 +1e-13 100e-15 +100e-15 100e-15 +100e-15 100.00000e-15 +100.00000e-15 00000100e-15 +0000100e-15 100.00000e-15 +100.00000e-15 100e-15 +100e-15 100.00000e-15 +100.00000e-15 100e-15 +100e-15 100.00000e-15 +100.00000e-15 +1e-12 1e-12 +1e-12 1e-12 +1e-12 1.00000e-12 +1.00000e-12 00000001e-12 +0000001e-12 01.00000e-12 +1.00000e-12 1e-12 +1e-12 1.00000e-12 +1.00000e-12 1e-12 +1e-12 1.00000e-12 +1.00000e-12 +1e-11 10e-12 +10e-12 10e-12 +10e-12 10.00000e-12 +10.00000e-12 00000010e-12 +0000010e-12 10.00000e-12 +10.00000e-12 10e-12 +10e-12 10.00000e-12 +10.00000e-12 10e-12 +10e-12 10.00000e-12 +10.00000e-12 +1e-10 100e-12 +100e-12 100e-12 +100e-12 100.00000e-12 +100.00000e-12 00000100e-12 +0000100e-12 100.00000e-12 +100.00000e-12 100e-12 +100e-12 100.00000e-12 +100.00000e-12 100e-12 +100e-12 100.00000e-12 +100.00000e-12 +1e-09 1e-9 +1e-9 1e-9 +1e-9 1.00000e-9 +1.00000e-9 000000001e-9 +00000001e-9 001.00000e-9 +01.00000e-9 1e-9 +1e-9 1.00000e-9 +1.00000e-9 1e-9 +1e-9 1.00000e-9 +1.00000e-9 +1e-08 10e-9 +10e-9 10e-9 +10e-9 10.00000e-9 +10.00000e-9 000000010e-9 +00000010e-9 010.00000e-9 +10.00000e-9 10e-9 +10e-9 10.00000e-9 +10.00000e-9 10e-9 +10e-9 10.00000e-9 +10.00000e-9 +1e-07 100e-9 +100e-9 100e-9 +100e-9 100.00000e-9 +100.00000e-9 000000100e-9 +00000100e-9 100.00000e-9 +100.00000e-9 100e-9 +100e-9 100.00000e-9 +100.00000e-9 100e-9 +100e-9 100.00000e-9 +100.00000e-9 +1e-06 1e-6 +1e-6 1e-6 +1e-6 1.00000e-6 +1.00000e-6 000000001e-6 +00000001e-6 001.00000e-6 +01.00000e-6 1e-6 +1e-6 1.00000e-6 +1.00000e-6 1e-6 +1e-6 1.00000e-6 +1.00000e-6 +1e-05 10e-6 +10e-6 10e-6 +10e-6 10.00000e-6 +10.00000e-6 000000010e-6 +00000010e-6 010.00000e-6 +10.00000e-6 10e-6 +10e-6 10.00000e-6 +10.00000e-6 10e-6 +10e-6 10.00000e-6 +10.00000e-6 +0.0001 100e-6 +100e-6 100e-6 +100e-6 100.00000e-6 +100.00000e-6 000000100e-6 +00000100e-6 100.00000e-6 +100.00000e-6 100e-6 +100e-6 100.00000e-6 +100.00000e-6 100e-6 +100e-6 100.00000e-6 +100.00000e-6 +0.001 1e-3 +1e-3 1e-3 +1e-3 1.00000e-3 +1.00000e-3 000000001e-3 +00000001e-3 001.00000e-3 +01.00000e-3 1e-3 +1e-3 1.00000e-3 +1.00000e-3 1e-3 +1e-3 1.00000e-3 +1.00000e-3 +0.01 10e-3 +10e-3 10e-3 +10e-3 10.00000e-3 +10.00000e-3 000000010e-3 +00000010e-3 010.00000e-3 +10.00000e-3 10e-3 +10e-3 10.00000e-3 +10.00000e-3 10e-3 +10e-3 10.00000e-3 +10.00000e-3 +0.1 100e-3 +100e-3 100e-3 +100e-3 100.00000e-3 +100.00000e-3 000000100e-3 +00000100e-3 100.00000e-3 +100.00000e-3 100e-3 +100e-3 100.00000e-3 +100.00000e-3 100e-3 +100e-3 100.00000e-3 +100.00000e-3 +1. 1e0 +1e0 1e0 +1e0 1.00000e0 +1.00000e0 0000000001e0 +000000001e0 0001.00000e0 +001.00000e0 1e0 +1e0 1.00000e0 +1.00000e0 1e0 +1e0 1.00000e0 +1.00000e0 +10. 10e0 +10e0 10e0 +10e0 10.00000e0 +10.00000e0 0000000010e0 +000000010e0 0010.00000e0 +010.00000e0 10e0 +10e0 10.00000e0 +10.00000e0 10e0 +10e0 10.00000e0 +10.00000e0 +100. 100e0 +100e0 100e0 +100e0 100.00000e0 +100.00000e0 0000000100e0 +000000100e0 0100.00000e0 +100.00000e0 100e0 +100e0 100.00000e0 +100.00000e0 100e0 +100e0 100.00000e0 +100.00000e0 +1000. 1e3 +1e3 1e3 +1e3 1.00000e3 +1.00000e3 0000000001e3 +000000001e3 0001.00000e3 +001.00000e3 1e3 +1e3 1.00000e3 +1.00000e3 1e3 +1e3 1.00000e3 +1.00000e3 +10000. 10e3 +10e3 10e3 +10e3 10.00000e3 +10.00000e3 0000000010e3 +000000010e3 0010.00000e3 +010.00000e3 10e3 +10e3 10.00000e3 +10.00000e3 10e3 +10e3 10.00000e3 +10.00000e3 +100000. 100e3 +100e3 100e3 +100e3 100.00000e3 +100.00000e3 0000000100e3 +000000100e3 0100.00000e3 +100.00000e3 100e3 +100e3 100.00000e3 +100.00000e3 100e3 +100e3 100.00000e3 +100.00000e3 +1000000. 1e6 +1e6 1e6 +1e6 1.00000e6 +1.00000e6 0000000001e6 +000000001e6 0001.00000e6 +001.00000e6 1e6 +1e6 1.00000e6 +1.00000e6 1e6 +1e6 1.00000e6 +1.00000e6 +10000000. 10e6 +10e6 10e6 +10e6 10.00000e6 +10.00000e6 0000000010e6 +000000010e6 0010.00000e6 +010.00000e6 10e6 +10e6 10.00000e6 +10.00000e6 10e6 +10e6 10.00000e6 +10.00000e6 +100000000. 100e6 +100e6 100e6 +100e6 100.00000e6 +100.00000e6 0000000100e6 +000000100e6 0100.00000e6 +100.00000e6 100e6 +100e6 100.00000e6 +100.00000e6 100e6 +100e6 100.00000e6 +100.00000e6 +1000000000. 1e9 +1e9 1e9 +1e9 1.00000e9 +1.00000e9 0000000001e9 +000000001e9 0001.00000e9 +001.00000e9 1e9 +1e9 1.00000e9 +1.00000e9 1e9 +1e9 1.00000e9 +1.00000e9 +10000000000. 10e9 +10e9 10e9 +10e9 10.00000e9 +10.00000e9 0000000010e9 +000000010e9 0010.00000e9 +010.00000e9 10e9 +10e9 10.00000e9 +10.00000e9 10e9 +10e9 10.00000e9 +10.00000e9 +100000000000. 100e9 +100e9 100e9 +100e9 100.00000e9 +100.00000e9 0000000100e9 +000000100e9 0100.00000e9 +100.00000e9 100e9 +100e9 100.00000e9 +100.00000e9 100e9 +100e9 100.00000e9 +100.00000e9 +1000000000000. 1e12 +1e12 1e12 +1e12 1.00000e12 +1.00000e12 000000001e12 +00000001e12 001.00000e12 +01.00000e12 1e12 +1e12 1.00000e12 +1.00000e12 1e12 +1e12 1.00000e12 +1.00000e12 +10000000000000. 10e12 +10e12 10e12 +10e12 10.00000e12 +10.00000e12 000000010e12 +00000010e12 010.00000e12 +10.00000e12 10e12 +10e12 10.00000e12 +10.00000e12 10e12 +10e12 10.00000e12 +10.00000e12 +100000000000000. 100e12 +100e12 100e12 +100e12 100.00000e12 +100.00000e12 000000100e12 +00000100e12 100.00000e12 +100.00000e12 100e12 +100e12 100.00000e12 +100.00000e12 100e12 +100e12 100.00000e12 +100.00000e12 +1e+15 1e15 +1e15 1e15 +1e15 1.00000e15 +1.00000e15 000000001e15 +00000001e15 001.00000e15 +01.00000e15 1e15 +1e15 1.00000e15 +1.00000e15 1e15 +1e15 1.00000e15 +1.00000e15 +1e+16 10e15 +10e15 10e15 +10e15 10.00000e15 +10.00000e15 000000010e15 +00000010e15 010.00000e15 +10.00000e15 10e15 +10e15 10.00000e15 +10.00000e15 10e15 +10e15 10.00000e15 +10.00000e15 +1e+17 100e15 +100e15 100e15 +100e15 100.00000e15 +100.00000e15 000000100e15 +00000100e15 100.00000e15 +100.00000e15 100e15 +100e15 100.00000e15 +100.00000e15 100e15 +100e15 100.00000e15 +100.00000e15 +1e+18 1e18 +1e18 1e18 +1e18 1.00000e18 +1.00000e18 000000001e18 +00000001e18 001.00000e18 +01.00000e18 1e18 +1e18 1.00000e18 +1.00000e18 1e18 +1e18 1.00000e18 +1.00000e18 +1e+19 10e18 +10e18 10e18 +10e18 10.00000e18 +10.00000e18 000000010e18 +00000010e18 010.00000e18 +10.00000e18 10e18 +10e18 10.00000e18 +10.00000e18 10e18 +10e18 10.00000e18 +10.00000e18 +1e+20 100e18 +100e18 100e18 +100e18 100.00000e18 +100.00000e18 000000100e18 +00000100e18 100.00000e18 +100.00000e18 100e18 +100e18 100.00000e18 +100.00000e18 100e18 +100e18 100.00000e18 +100.00000e18 +1e+21 1e21 +1e21 1e21 +1e21 1.00000e21 +1.00000e21 000000001e21 +00000001e21 001.00000e21 +01.00000e21 1e21 +1e21 1.00000e21 +1.00000e21 1e21 +1e21 1.00000e21 +1.00000e21 +1e+22 10e21 +10e21 10e21 +10e21 10.00000e21 +10.00000e21 000000010e21 +00000010e21 010.00000e21 +10.00000e21 10e21 +10e21 10.00000e21 +10.00000e21 10e21 +10e21 10.00000e21 +10.00000e21 +1e+23 100e21 +100e21 100e21 +100e21 100.00000e21 +100.00000e21 000000100e21 +00000100e21 100.00000e21 +100.00000e21 100e21 +100e21 100.00000e21 +100.00000e21 100e21 +100e21 100.00000e21 +100.00000e21 +1e+24 1e24 +1e24 1e24 +1e24 1.00000e24 +1.00000e24 000000001e24 +00000001e24 001.00000e24 +01.00000e24 1e24 +1e24 1.00000e24 +1.00000e24 1e24 +1e24 1.00000e24 +1.00000e24 +1e+25 10e24 +10e24 10e24 +10e24 10.00000e24 +10.00000e24 000000010e24 +00000010e24 010.00000e24 +10.00000e24 10e24 +10e24 10.00000e24 +10.00000e24 10e24 +10e24 10.00000e24 +10.00000e24 +1e+26 100e24 +100e24 100e24 +100e24 100.00000e24 +100.00000e24 000000100e24 +00000100e24 100.00000e24 +100.00000e24 100e24 +100e24 100.00000e24 +100.00000e24 100e24 +100e24 100.00000e24 +100.00000e24 +1e+27 1e27 +1e27 1e27 +1e27 1.00000e27 +1.00000e27 000000001e27 +00000001e27 001.00000e27 +01.00000e27 1e27 +1e27 1.00000e27 +1.00000e27 1e27 +1e27 1.00000e27 +1.00000e27 +1e+28 10e27 +10e27 10e27 +10e27 10.00000e27 +10.00000e27 000000010e27 +00000010e27 010.00000e27 +10.00000e27 10e27 +10e27 10.00000e27 +10.00000e27 10e27 +10e27 10.00000e27 +10.00000e27 +1e+29 100e27 +100e27 100e27 +100e27 100.00000e27 +100.00000e27 000000100e27 +00000100e27 100.00000e27 +100.00000e27 100e27 +100e27 100.00000e27 +100.00000e27 100e27 +100e27 100.00000e27 +100.00000e27 + +1e-27 1e-27 +1e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 00000001e-27 +0000001e-27 01.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 +4.2e-26 42e-27 +42e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 00000042e-27 +0000042e-27 42.00000e-27 +42.00000e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 +1.764e-24 1.764e-24 +1.764e-24 1.764e-24 +1.764e-24 1.76400e-24 +1.76400e-24 0001.764e-24 +001.764e-24 01.76400e-24 +1.76400e-24 1.764e-24 +1.764e-24 1.76400e-24 +1.76400e-24 1.764e-24 +1.764e-24 1.76400e-24 +1.76400e-24 +7.4088e-23 74.088e-24 +74.088e-24 74.088e-24 +74.088e-24 74.08800e-24 +74.08800e-24 0074.088e-24 +074.088e-24 74.08800e-24 +74.08800e-24 74.088e-24 +74.088e-24 74.08800e-24 +74.08800e-24 74.088e-24 +74.088e-24 74.08800e-24 +74.08800e-24 +3.111696e-21 3.1117e-21 +3.1117e-21 3.1117e-21 +3.1117e-21 3.11170e-21 +3.11170e-21 003.1117e-21 +03.1117e-21 03.11170e-21 +3.11170e-21 3.1117e-21 +3.1117e-21 3.11170e-21 +3.11170e-21 3.1117e-21 +3.1117e-21 3.11170e-21 +3.11170e-21 +1.30691232e-19 130.691e-21 +130.691e-21 130.69e-21 +130.69e-21 130.69123e-21 +130.69123e-21 00130.69e-21 +0130.69e-21 130.69123e-21 +130.69123e-21 130.69e-21 +130.69e-21 130.69123e-21 +130.69123e-21 130.69e-21 +130.69e-21 130.69123e-21 +130.69123e-21 +5.489031744e-18 5.48903e-18 +5.48903e-18 5.489e-18 +5.489e-18 5.48903e-18 +5.48903e-18 0005.489e-18 +005.489e-18 05.48903e-18 +5.48903e-18 5.489e-18 +5.489e-18 5.48903e-18 +5.48903e-18 5.489e-18 +5.489e-18 5.48903e-18 +5.48903e-18 +2.30539333248e-16 230.539e-18 +230.539e-18 230.54e-18 +230.54e-18 230.53933e-18 +230.53933e-18 00230.54e-18 +0230.54e-18 230.53933e-18 +230.53933e-18 230.54e-18 +230.54e-18 230.53933e-18 +230.53933e-18 230.54e-18 +230.54e-18 230.53933e-18 +230.53933e-18 +9.682651996416e-15 9.68265e-15 +9.68265e-15 9.6827e-15 +9.6827e-15 9.68265e-15 +9.68265e-15 009.6827e-15 +09.6827e-15 09.68265e-15 +9.68265e-15 9.6827e-15 +9.6827e-15 9.68265e-15 +9.68265e-15 9.6827e-15 +9.6827e-15 9.68265e-15 +9.68265e-15 +4.06671383849472e-13 406.671e-15 +406.671e-15 406.67e-15 +406.67e-15 406.67138e-15 +406.67138e-15 00406.67e-15 +0406.67e-15 406.67138e-15 +406.67138e-15 406.67e-15 +406.67e-15 406.67138e-15 +406.67138e-15 406.67e-15 +406.67e-15 406.67138e-15 +406.67138e-15 +1.70801981216778e-11 17.0802e-12 +17.0802e-12 17.08e-12 +17.08e-12 17.08020e-12 +17.08020e-12 00017.08e-12 +0017.08e-12 17.08020e-12 +17.08020e-12 17.08e-12 +17.08e-12 17.08020e-12 +17.08020e-12 17.08e-12 +17.08e-12 17.08020e-12 +17.08020e-12 +7.17368321110469e-10 717.368e-12 +717.368e-12 717.37e-12 +717.37e-12 717.36832e-12 +717.36832e-12 00717.37e-12 +0717.37e-12 717.36832e-12 +717.36832e-12 717.37e-12 +717.37e-12 717.36832e-12 +717.36832e-12 717.37e-12 +717.37e-12 717.36832e-12 +717.36832e-12 +3.01294694866397e-08 30.1295e-9 +30.1295e-9 30.129e-9 +30.129e-9 30.12947e-9 +30.12947e-9 00030.129e-9 +0030.129e-9 030.12947e-9 +30.12947e-9 30.129e-9 +30.129e-9 30.12947e-9 +30.12947e-9 30.129e-9 +30.129e-9 30.12947e-9 +30.12947e-9 +1.26543771843887e-06 1.26544e-6 +1.26544e-6 1.2654e-6 +1.2654e-6 1.26544e-6 +1.26544e-6 0001.2654e-6 +001.2654e-6 001.26544e-6 +01.26544e-6 1.2654e-6 +1.2654e-6 1.26544e-6 +1.26544e-6 1.2654e-6 +1.2654e-6 1.26544e-6 +1.26544e-6 +5.31483841744324e-05 53.1484e-6 +53.1484e-6 53.148e-6 +53.148e-6 53.14838e-6 +53.14838e-6 00053.148e-6 +0053.148e-6 053.14838e-6 +53.14838e-6 53.148e-6 +53.148e-6 53.14838e-6 +53.14838e-6 53.148e-6 +53.148e-6 53.14838e-6 +53.14838e-6 +0.00223223213532616 2.23223e-3 +2.23223e-3 2.2322e-3 +2.2322e-3 2.23223e-3 +2.23223e-3 0002.2322e-3 +002.2322e-3 002.23223e-3 +02.23223e-3 2.2322e-3 +2.2322e-3 2.23223e-3 +2.23223e-3 2.2322e-3 +2.2322e-3 2.23223e-3 +2.23223e-3 +0.0937537496836987 93.7537e-3 +93.7537e-3 93.754e-3 +93.754e-3 93.75375e-3 +93.75375e-3 00093.754e-3 +0093.754e-3 093.75375e-3 +93.75375e-3 93.754e-3 +93.754e-3 93.75375e-3 +93.75375e-3 93.754e-3 +93.754e-3 93.75375e-3 +93.75375e-3 +3.93765748671535 3.93766e0 +3.93766e0 3.9377e0 +3.9377e0 3.93766e0 +3.93766e0 00003.9377e0 +0003.9377e0 0003.93766e0 +003.93766e0 3.9377e0 +3.9377e0 3.93766e0 +3.93766e0 3.9377e0 +3.9377e0 3.93766e0 +3.93766e0 +165.381614442045 165.382e0 +165.382e0 165.38e0 +165.38e0 165.38161e0 +165.38161e0 0000165.38e0 +000165.38e0 0165.38161e0 +165.38161e0 165.38e0 +165.38e0 165.38161e0 +165.38161e0 165.38e0 +165.38e0 165.38161e0 +165.38161e0 +6946.02780656587 6.94603e3 +6.94603e3 6.946e3 +6.946e3 6.94603e3 +6.94603e3 000006.946e3 +00006.946e3 0006.94603e3 +006.94603e3 6.946e3 +6.946e3 6.94603e3 +6.94603e3 6.946e3 +6.946e3 6.94603e3 +6.94603e3 +291733.167875767 291.733e3 +291.733e3 291.73e3 +291.73e3 291.73317e3 +291.73317e3 0000291.73e3 +000291.73e3 0291.73317e3 +291.73317e3 291.73e3 +291.73e3 291.73317e3 +291.73317e3 291.73e3 +291.73e3 291.73317e3 +291.73317e3 +12252793.0507822 12.2528e6 +12.2528e6 12.253e6 +12.253e6 12.25279e6 +12.25279e6 000012.253e6 +00012.253e6 0012.25279e6 +012.25279e6 12.253e6 +12.253e6 12.25279e6 +12.25279e6 12.253e6 +12.253e6 12.25279e6 +12.25279e6 +514617308.132852 514.617e6 +514.617e6 514.62e6 +514.62e6 514.61731e6 +514.61731e6 0000514.62e6 +000514.62e6 0514.61731e6 +514.61731e6 514.62e6 +514.62e6 514.61731e6 +514.61731e6 514.62e6 +514.62e6 514.61731e6 +514.61731e6 +21613926941.5798 21.6139e9 +21.6139e9 21.614e9 +21.614e9 21.61393e9 +21.61393e9 000021.614e9 +00021.614e9 0021.61393e9 +021.61393e9 21.614e9 +21.614e9 21.61393e9 +21.61393e9 21.614e9 +21.614e9 21.61393e9 +21.61393e9 +907784931546.352 907.785e9 +907.785e9 907.78e9 +907.78e9 907.78493e9 +907.78493e9 0000907.78e9 +000907.78e9 0907.78493e9 +907.78493e9 907.78e9 +907.78e9 907.78493e9 +907.78493e9 907.78e9 +907.78e9 907.78493e9 +907.78493e9 +38126967124946.8 38.127e12 +38.127e12 38.127e12 +38.127e12 38.12697e12 +38.12697e12 00038.127e12 +0038.127e12 038.12697e12 +38.12697e12 38.127e12 +38.127e12 38.12697e12 +38.12697e12 38.127e12 +38.127e12 38.12697e12 +38.12697e12 +1.60133261924776e+15 1.60133e15 +1.60133e15 1.6013e15 +1.6013e15 1.60133e15 +1.60133e15 0001.6013e15 +001.6013e15 001.60133e15 +01.60133e15 1.6013e15 +1.6013e15 1.60133e15 +1.60133e15 1.6013e15 +1.6013e15 1.60133e15 +1.60133e15 +6.72559700084061e+16 67.256e15 +67.256e15 67.256e15 +67.256e15 67.25597e15 +67.25597e15 00067.256e15 +0067.256e15 067.25597e15 +67.25597e15 67.256e15 +67.256e15 67.25597e15 +67.25597e15 67.256e15 +67.256e15 67.25597e15 +67.25597e15 +2.82475074035306e+18 2.82475e18 +2.82475e18 2.8248e18 +2.8248e18 2.82475e18 +2.82475e18 0002.8248e18 +002.8248e18 002.82475e18 +02.82475e18 2.8248e18 +2.8248e18 2.82475e18 +2.82475e18 2.8248e18 +2.8248e18 2.82475e18 +2.82475e18 +1.18639531094828e+20 118.64e18 +118.64e18 118.64e18 +118.64e18 118.63953e18 +118.63953e18 000118.64e18 +00118.64e18 118.63953e18 +118.63953e18 118.64e18 +118.64e18 118.63953e18 +118.63953e18 118.64e18 +118.64e18 118.63953e18 +118.63953e18 +4.98286030598279e+21 4.98286e21 +4.98286e21 4.9829e21 +4.9829e21 4.98286e21 +4.98286e21 0004.9829e21 +004.9829e21 004.98286e21 +04.98286e21 4.9829e21 +4.9829e21 4.98286e21 +4.98286e21 4.9829e21 +4.9829e21 4.98286e21 +4.98286e21 +2.09280132851277e+23 209.28e21 +209.28e21 209.28e21 +209.28e21 209.28013e21 +209.28013e21 000209.28e21 +00209.28e21 209.28013e21 +209.28013e21 209.28e21 +209.28e21 209.28013e21 +209.28013e21 209.28e21 +209.28e21 209.28013e21 +209.28013e21 +8.78976557975365e+24 8.78977e24 +8.78977e24 8.7898e24 +8.7898e24 8.78977e24 +8.78977e24 0008.7898e24 +008.7898e24 008.78977e24 +08.78977e24 8.7898e24 +8.7898e24 8.78977e24 +8.78977e24 8.7898e24 +8.7898e24 8.78977e24 +8.78977e24 +3.69170154349653e+26 369.17e24 +369.17e24 369.17e24 +369.17e24 369.17015e24 +369.17015e24 000369.17e24 +00369.17e24 369.17015e24 +369.17015e24 369.17e24 +369.17e24 369.17015e24 +369.17015e24 369.17e24 +369.17e24 369.17015e24 +369.17015e24 +1.55051464826854e+28 15.5051e27 +15.5051e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 00015.505e27 +0015.505e27 015.50515e27 +15.50515e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 +6.51216152272788e+29 651.216e27 +651.216e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 000651.22e27 +00651.22e27 651.21615e27 +651.21615e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 + +1e-27 1e-27 +1e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 00000001e-27 +0000001e-27 01.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 +1e-26 10e-27 +10e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 00000010e-27 +0000010e-27 10.00000e-27 +10.00000e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 +1e-25 100e-27 +100e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 00000100e-27 +0000100e-27 100.00000e-27 +100.00000e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 +1e-24 1y +1y 1y +1y 1.00000y +1.00000y 00000001y +0000001y 01.00000y +1.00000y 1y +1y 1.00000y +1.00000y 1y +1y 1.00000y +1.00000y +1e-23 10y +10y 10y +10y 10.00000y +10.00000y 00000010y +0000010y 10.00000y +10.00000y 10y +10y 10.00000y +10.00000y 10y +10y 10.00000y +10.00000y +1e-22 100y +100y 100y +100y 100.00000y +100.00000y 00000100y +0000100y 100.00000y +100.00000y 100y +100y 100.00000y +100.00000y 100y +100y 100.00000y +100.00000y +1e-21 1z +1z 1z +1z 1.00000z +1.00000z 00000001z +0000001z 01.00000z +1.00000z 1z +1z 1.00000z +1.00000z 1z +1z 1.00000z +1.00000z +1e-20 10z +10z 10z +10z 10.00000z +10.00000z 00000010z +0000010z 10.00000z +10.00000z 10z +10z 10.00000z +10.00000z 10z +10z 10.00000z +10.00000z +1e-19 100z +100z 100z +100z 100.00000z +100.00000z 00000100z +0000100z 100.00000z +100.00000z 100z +100z 100.00000z +100.00000z 100z +100z 100.00000z +100.00000z +1e-18 1a +1a 1a +1a 1.00000a +1.00000a 00000001a +0000001a 01.00000a +1.00000a 1a +1a 1.00000a +1.00000a 1a +1a 1.00000a +1.00000a +1e-17 10a +10a 10a +10a 10.00000a +10.00000a 00000010a +0000010a 10.00000a +10.00000a 10a +10a 10.00000a +10.00000a 10a +10a 10.00000a +10.00000a +1e-16 100a +100a 100a +100a 100.00000a +100.00000a 00000100a +0000100a 100.00000a +100.00000a 100a +100a 100.00000a +100.00000a 100a +100a 100.00000a +100.00000a +1e-15 1f +1f 1f +1f 1.00000f +1.00000f 00000001f +0000001f 01.00000f +1.00000f 1f +1f 1.00000f +1.00000f 1f +1f 1.00000f +1.00000f +1e-14 10f +10f 10f +10f 10.00000f +10.00000f 00000010f +0000010f 10.00000f +10.00000f 10f +10f 10.00000f +10.00000f 10f +10f 10.00000f +10.00000f +1e-13 100f +100f 100f +100f 100.00000f +100.00000f 00000100f +0000100f 100.00000f +100.00000f 100f +100f 100.00000f +100.00000f 100f +100f 100.00000f +100.00000f +1e-12 1p +1p 1p +1p 1.00000p +1.00000p 00000001p +0000001p 01.00000p +1.00000p 1p +1p 1.00000p +1.00000p 1p +1p 1.00000p +1.00000p +1e-11 10p +10p 10p +10p 10.00000p +10.00000p 00000010p +0000010p 10.00000p +10.00000p 10p +10p 10.00000p +10.00000p 10p +10p 10.00000p +10.00000p +1e-10 100p +100p 100p +100p 100.00000p +100.00000p 00000100p +0000100p 100.00000p +100.00000p 100p +100p 100.00000p +100.00000p 100p +100p 100.00000p +100.00000p +1e-09 1n +1n 1n +1n 1.00000n +1.00000n 000000001n +00000001n 001.00000n +01.00000n 1n +1n 1.00000n +1.00000n 1n +1n 1.00000n +1.00000n +1e-08 10n +10n 10n +10n 10.00000n +10.00000n 000000010n +00000010n 010.00000n +10.00000n 10n +10n 10.00000n +10.00000n 10n +10n 10.00000n +10.00000n +1e-07 100n +100n 100n +100n 100.00000n +100.00000n 000000100n +00000100n 100.00000n +100.00000n 100n +100n 100.00000n +100.00000n 100n +100n 100.00000n +100.00000n +1e-06 1u +1u 1u +1u 1.00000u +1.00000u 000000001u +00000001u 001.00000u +01.00000u 1u +1u 1.00000u +1.00000u 1u +1u 1.00000u +1.00000u +1e-05 10u +10u 10u +10u 10.00000u +10.00000u 000000010u +00000010u 010.00000u +10.00000u 10u +10u 10.00000u +10.00000u 10u +10u 10.00000u +10.00000u +0.0001 100u +100u 100u +100u 100.00000u +100.00000u 000000100u +00000100u 100.00000u +100.00000u 100u +100u 100.00000u +100.00000u 100u +100u 100.00000u +100.00000u +0.001 1m +1m 1m +1m 1.00000m +1.00000m 000000001m +00000001m 001.00000m +01.00000m 1m +1m 1.00000m +1.00000m 1m +1m 1.00000m +1.00000m +0.01 10m +10m 10m +10m 10.00000m +10.00000m 000000010m +00000010m 010.00000m +10.00000m 10m +10m 10.00000m +10.00000m 10m +10m 10.00000m +10.00000m +0.1 100m +100m 100m +100m 100.00000m +100.00000m 000000100m +00000100m 100.00000m +100.00000m 100m +100m 100.00000m +100.00000m 100m +100m 100.00000m +100.00000m +1. 1 +1 1 +1 1.00000 +1.00000 0000000001 +000000001 0001.00000 +001.00000 1 +1 1.00000 +1.00000 1 +1 1.00000 +1.00000 +10. 10 +10 10 +10 10.00000 +10.00000 0000000010 +000000010 0010.00000 +010.00000 10 +10 10.00000 +10.00000 10 +10 10.00000 +10.00000 +100. 100 +100 100 +100 100.00000 +100.00000 0000000100 +000000100 0100.00000 +100.00000 100 +100 100.00000 +100.00000 100 +100 100.00000 +100.00000 +1000. 1K +1K 1K +1K 1.00000K +1.00000K 0000000001K +000000001K 0001.00000K +001.00000K 1K +1K 1.00000K +1.00000K 1K +1K 1.00000K +1.00000K +10000. 10K +10K 10K +10K 10.00000K +10.00000K 0000000010K +000000010K 0010.00000K +010.00000K 10K +10K 10.00000K +10.00000K 10K +10K 10.00000K +10.00000K +100000. 100K +100K 100K +100K 100.00000K +100.00000K 0000000100K +000000100K 0100.00000K +100.00000K 100K +100K 100.00000K +100.00000K 100K +100K 100.00000K +100.00000K +1000000. 1M +1M 1M +1M 1.00000M +1.00000M 0000000001M +000000001M 0001.00000M +001.00000M 1M +1M 1.00000M +1.00000M 1M +1M 1.00000M +1.00000M +10000000. 10M +10M 10M +10M 10.00000M +10.00000M 0000000010M +000000010M 0010.00000M +010.00000M 10M +10M 10.00000M +10.00000M 10M +10M 10.00000M +10.00000M +100000000. 100M +100M 100M +100M 100.00000M +100.00000M 0000000100M +000000100M 0100.00000M +100.00000M 100M +100M 100.00000M +100.00000M 100M +100M 100.00000M +100.00000M +1000000000. 1G +1G 1G +1G 1.00000G +1.00000G 0000000001G +000000001G 0001.00000G +001.00000G 1G +1G 1.00000G +1.00000G 1G +1G 1.00000G +1.00000G +10000000000. 10G +10G 10G +10G 10.00000G +10.00000G 0000000010G +000000010G 0010.00000G +010.00000G 10G +10G 10.00000G +10.00000G 10G +10G 10.00000G +10.00000G +100000000000. 100G +100G 100G +100G 100.00000G +100.00000G 0000000100G +000000100G 0100.00000G +100.00000G 100G +100G 100.00000G +100.00000G 100G +100G 100.00000G +100.00000G +1000000000000. 1T +1T 1T +1T 1.00000T +1.00000T 000000001T +00000001T 001.00000T +01.00000T 1T +1T 1.00000T +1.00000T 1T +1T 1.00000T +1.00000T +10000000000000. 10T +10T 10T +10T 10.00000T +10.00000T 000000010T +00000010T 010.00000T +10.00000T 10T +10T 10.00000T +10.00000T 10T +10T 10.00000T +10.00000T +100000000000000. 100T +100T 100T +100T 100.00000T +100.00000T 000000100T +00000100T 100.00000T +100.00000T 100T +100T 100.00000T +100.00000T 100T +100T 100.00000T +100.00000T +1e+15 1P +1P 1P +1P 1.00000P +1.00000P 000000001P +00000001P 001.00000P +01.00000P 1P +1P 1.00000P +1.00000P 1P +1P 1.00000P +1.00000P +1e+16 10P +10P 10P +10P 10.00000P +10.00000P 000000010P +00000010P 010.00000P +10.00000P 10P +10P 10.00000P +10.00000P 10P +10P 10.00000P +10.00000P +1e+17 100P +100P 100P +100P 100.00000P +100.00000P 000000100P +00000100P 100.00000P +100.00000P 100P +100P 100.00000P +100.00000P 100P +100P 100.00000P +100.00000P +1e+18 1E +1E 1E +1E 1.00000E +1.00000E 000000001E +00000001E 001.00000E +01.00000E 1E +1E 1.00000E +1.00000E 1E +1E 1.00000E +1.00000E +1e+19 10E +10E 10E +10E 10.00000E +10.00000E 000000010E +00000010E 010.00000E +10.00000E 10E +10E 10.00000E +10.00000E 10E +10E 10.00000E +10.00000E +1e+20 100E +100E 100E +100E 100.00000E +100.00000E 000000100E +00000100E 100.00000E +100.00000E 100E +100E 100.00000E +100.00000E 100E +100E 100.00000E +100.00000E +1e+21 1Z +1Z 1Z +1Z 1.00000Z +1.00000Z 000000001Z +00000001Z 001.00000Z +01.00000Z 1Z +1Z 1.00000Z +1.00000Z 1Z +1Z 1.00000Z +1.00000Z +1e+22 10Z +10Z 10Z +10Z 10.00000Z +10.00000Z 000000010Z +00000010Z 010.00000Z +10.00000Z 10Z +10Z 10.00000Z +10.00000Z 10Z +10Z 10.00000Z +10.00000Z +1e+23 100Z +100Z 100Z +100Z 100.00000Z +100.00000Z 000000100Z +00000100Z 100.00000Z +100.00000Z 100Z +100Z 100.00000Z +100.00000Z 100Z +100Z 100.00000Z +100.00000Z +1e+24 1Y +1Y 1Y +1Y 1.00000Y +1.00000Y 000000001Y +00000001Y 001.00000Y +01.00000Y 1Y +1Y 1.00000Y +1.00000Y 1Y +1Y 1.00000Y +1.00000Y +1e+25 10Y +10Y 10Y +10Y 10.00000Y +10.00000Y 000000010Y +00000010Y 010.00000Y +10.00000Y 10Y +10Y 10.00000Y +10.00000Y 10Y +10Y 10.00000Y +10.00000Y +1e+26 100Y +100Y 100Y +100Y 100.00000Y +100.00000Y 000000100Y +00000100Y 100.00000Y +100.00000Y 100Y +100Y 100.00000Y +100.00000Y 100Y +100Y 100.00000Y +100.00000Y +1e+27 1e27 +1e27 1e27 +1e27 1.00000e27 +1.00000e27 000000001e27 +00000001e27 001.00000e27 +01.00000e27 1e27 +1e27 1.00000e27 +1.00000e27 1e27 +1e27 1.00000e27 +1.00000e27 +1e+28 10e27 +10e27 10e27 +10e27 10.00000e27 +10.00000e27 000000010e27 +00000010e27 010.00000e27 +10.00000e27 10e27 +10e27 10.00000e27 +10.00000e27 10e27 +10e27 10.00000e27 +10.00000e27 +1e+29 100e27 +100e27 100e27 +100e27 100.00000e27 +100.00000e27 000000100e27 +00000100e27 100.00000e27 +100.00000e27 100e27 +100e27 100.00000e27 +100.00000e27 100e27 +100e27 100.00000e27 +100.00000e27 + +1e-27 1e-27 +1e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 00000001e-27 +0000001e-27 01.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 +4.2e-26 42e-27 +42e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 00000042e-27 +0000042e-27 42.00000e-27 +42.00000e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 +1.764e-24 1.764y +1.764y 1.764y +1.764y 1.76400y +1.76400y 0001.764y +001.764y 01.76400y +1.76400y 1.764y +1.764y 1.76400y +1.76400y 1.764y +1.764y 1.76400y +1.76400y +7.4088e-23 74.088y +74.088y 74.088y +74.088y 74.08800y +74.08800y 0074.088y +074.088y 74.08800y +74.08800y 74.088y +74.088y 74.08800y +74.08800y 74.088y +74.088y 74.08800y +74.08800y +3.111696e-21 3.1117z +3.1117z 3.1117z +3.1117z 3.11170z +3.11170z 003.1117z +03.1117z 03.11170z +3.11170z 3.1117z +3.1117z 3.11170z +3.11170z 3.1117z +3.1117z 3.11170z +3.11170z +1.30691232e-19 130.691z +130.691z 130.69z +130.69z 130.69123z +130.69123z 00130.69z +0130.69z 130.69123z +130.69123z 130.69z +130.69z 130.69123z +130.69123z 130.69z +130.69z 130.69123z +130.69123z +5.489031744e-18 5.48903a +5.48903a 5.489a +5.489a 5.48903a +5.48903a 0005.489a +005.489a 05.48903a +5.48903a 5.489a +5.489a 5.48903a +5.48903a 5.489a +5.489a 5.48903a +5.48903a +2.30539333248e-16 230.539a +230.539a 230.54a +230.54a 230.53933a +230.53933a 00230.54a +0230.54a 230.53933a +230.53933a 230.54a +230.54a 230.53933a +230.53933a 230.54a +230.54a 230.53933a +230.53933a +9.682651996416e-15 9.68265f +9.68265f 9.6827f +9.6827f 9.68265f +9.68265f 009.6827f +09.6827f 09.68265f +9.68265f 9.6827f +9.6827f 9.68265f +9.68265f 9.6827f +9.6827f 9.68265f +9.68265f +4.06671383849472e-13 406.671f +406.671f 406.67f +406.67f 406.67138f +406.67138f 00406.67f +0406.67f 406.67138f +406.67138f 406.67f +406.67f 406.67138f +406.67138f 406.67f +406.67f 406.67138f +406.67138f +1.70801981216778e-11 17.0802p +17.0802p 17.08p +17.08p 17.08020p +17.08020p 00017.08p +0017.08p 17.08020p +17.08020p 17.08p +17.08p 17.08020p +17.08020p 17.08p +17.08p 17.08020p +17.08020p +7.17368321110469e-10 717.368p +717.368p 717.37p +717.37p 717.36832p +717.36832p 00717.37p +0717.37p 717.36832p +717.36832p 717.37p +717.37p 717.36832p +717.36832p 717.37p +717.37p 717.36832p +717.36832p +3.01294694866397e-08 30.1295n +30.1295n 30.129n +30.129n 30.12947n +30.12947n 00030.129n +0030.129n 030.12947n +30.12947n 30.129n +30.129n 30.12947n +30.12947n 30.129n +30.129n 30.12947n +30.12947n +1.26543771843887e-06 1.26544u +1.26544u 1.2654u +1.2654u 1.26544u +1.26544u 0001.2654u +001.2654u 001.26544u +01.26544u 1.2654u +1.2654u 1.26544u +1.26544u 1.2654u +1.2654u 1.26544u +1.26544u +5.31483841744324e-05 53.1484u +53.1484u 53.148u +53.148u 53.14838u +53.14838u 00053.148u +0053.148u 053.14838u +53.14838u 53.148u +53.148u 53.14838u +53.14838u 53.148u +53.148u 53.14838u +53.14838u +0.00223223213532616 2.23223m +2.23223m 2.2322m +2.2322m 2.23223m +2.23223m 0002.2322m +002.2322m 002.23223m +02.23223m 2.2322m +2.2322m 2.23223m +2.23223m 2.2322m +2.2322m 2.23223m +2.23223m +0.0937537496836987 93.7537m +93.7537m 93.754m +93.754m 93.75375m +93.75375m 00093.754m +0093.754m 093.75375m +93.75375m 93.754m +93.754m 93.75375m +93.75375m 93.754m +93.754m 93.75375m +93.75375m +3.93765748671535 3.93766 +3.93766 3.9377 +3.9377 3.93766 +3.93766 00003.9377 +0003.9377 0003.93766 +003.93766 3.9377 +3.9377 3.93766 +3.93766 3.9377 +3.9377 3.93766 +3.93766 +165.381614442045 165.382 +165.382 165.38 +165.38 165.38161 +165.38161 0000165.38 +000165.38 0165.38161 +165.38161 165.38 +165.38 165.38161 +165.38161 165.38 +165.38 165.38161 +165.38161 +6946.02780656587 6.94603K +6.94603K 6.946K +6.946K 6.94603K +6.94603K 000006.946K +00006.946K 0006.94603K +006.94603K 6.946K +6.946K 6.94603K +6.94603K 6.946K +6.946K 6.94603K +6.94603K +291733.167875767 291.733K +291.733K 291.73K +291.73K 291.73317K +291.73317K 0000291.73K +000291.73K 0291.73317K +291.73317K 291.73K +291.73K 291.73317K +291.73317K 291.73K +291.73K 291.73317K +291.73317K +12252793.0507822 12.2528M +12.2528M 12.253M +12.253M 12.25279M +12.25279M 000012.253M +00012.253M 0012.25279M +012.25279M 12.253M +12.253M 12.25279M +12.25279M 12.253M +12.253M 12.25279M +12.25279M +514617308.132852 514.617M +514.617M 514.62M +514.62M 514.61731M +514.61731M 0000514.62M +000514.62M 0514.61731M +514.61731M 514.62M +514.62M 514.61731M +514.61731M 514.62M +514.62M 514.61731M +514.61731M +21613926941.5798 21.6139G +21.6139G 21.614G +21.614G 21.61393G +21.61393G 000021.614G +00021.614G 0021.61393G +021.61393G 21.614G +21.614G 21.61393G +21.61393G 21.614G +21.614G 21.61393G +21.61393G +907784931546.352 907.785G +907.785G 907.78G +907.78G 907.78493G +907.78493G 0000907.78G +000907.78G 0907.78493G +907.78493G 907.78G +907.78G 907.78493G +907.78493G 907.78G +907.78G 907.78493G +907.78493G +38126967124946.8 38.127T +38.127T 38.127T +38.127T 38.12697T +38.12697T 00038.127T +0038.127T 038.12697T +38.12697T 38.127T +38.127T 38.12697T +38.12697T 38.127T +38.127T 38.12697T +38.12697T +1.60133261924776e+15 1.60133P +1.60133P 1.6013P +1.6013P 1.60133P +1.60133P 0001.6013P +001.6013P 001.60133P +01.60133P 1.6013P +1.6013P 1.60133P +1.60133P 1.6013P +1.6013P 1.60133P +1.60133P +6.72559700084061e+16 67.256P +67.256P 67.256P +67.256P 67.25597P +67.25597P 00067.256P +0067.256P 067.25597P +67.25597P 67.256P +67.256P 67.25597P +67.25597P 67.256P +67.256P 67.25597P +67.25597P +2.82475074035306e+18 2.82475E +2.82475E 2.8248E +2.8248E 2.82475E +2.82475E 0002.8248E +002.8248E 002.82475E +02.82475E 2.8248E +2.8248E 2.82475E +2.82475E 2.8248E +2.8248E 2.82475E +2.82475E +1.18639531094828e+20 118.64E +118.64E 118.64E +118.64E 118.63953E +118.63953E 000118.64E +00118.64E 118.63953E +118.63953E 118.64E +118.64E 118.63953E +118.63953E 118.64E +118.64E 118.63953E +118.63953E +4.98286030598279e+21 4.98286Z +4.98286Z 4.9829Z +4.9829Z 4.98286Z +4.98286Z 0004.9829Z +004.9829Z 004.98286Z +04.98286Z 4.9829Z +4.9829Z 4.98286Z +4.98286Z 4.9829Z +4.9829Z 4.98286Z +4.98286Z +2.09280132851277e+23 209.28Z +209.28Z 209.28Z +209.28Z 209.28013Z +209.28013Z 000209.28Z +00209.28Z 209.28013Z +209.28013Z 209.28Z +209.28Z 209.28013Z +209.28013Z 209.28Z +209.28Z 209.28013Z +209.28013Z +8.78976557975365e+24 8.78977Y +8.78977Y 8.7898Y +8.7898Y 8.78977Y +8.78977Y 0008.7898Y +008.7898Y 008.78977Y +08.78977Y 8.7898Y +8.7898Y 8.78977Y +8.78977Y 8.7898Y +8.7898Y 8.78977Y +8.78977Y +3.69170154349653e+26 369.17Y +369.17Y 369.17Y +369.17Y 369.17015Y +369.17015Y 000369.17Y +00369.17Y 369.17015Y +369.17015Y 369.17Y +369.17Y 369.17015Y +369.17015Y 369.17Y +369.17Y 369.17015Y +369.17015Y +1.55051464826854e+28 15.5051e27 +15.5051e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 00015.505e27 +0015.505e27 015.50515e27 +15.50515e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 +6.51216152272788e+29 651.216e27 +651.216e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 000651.22e27 +00651.22e27 651.21615e27 +651.21615e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 + +-1e-27 -1e-27 -1e-27 -1e-27 -1e-27 -1.00000e-27 -1.00000e-27 -0000001e-27 -0000001e-27 -1.00000e-27 -1.00000e-27 -1e-27 -1e-27 -1.00000e-27 -1.00000e-27 -1e-27 -1e-27 -1.00000e-27 -1.00000e-27 +-4.2e-26 -42e-27 -42e-27 -42e-27 -42e-27 -42.00000e-27 -42.00000e-27 -0000042e-27 -0000042e-27 -42.00000e-27 -42.00000e-27 -42e-27 -42e-27 -42.00000e-27 -42.00000e-27 -42e-27 -42e-27 -42.00000e-27 -42.00000e-27 +-1.764e-24 -1.764e-24 -1.764e-24 -1.764e-24 -1.764e-24 -1.76400e-24 -1.76400e-24 -001.764e-24 -001.764e-24 -1.76400e-24 -1.76400e-24 -1.764e-24 -1.764e-24 -1.76400e-24 -1.76400e-24 -1.764e-24 -1.764e-24 -1.76400e-24 -1.76400e-24 +-7.4088e-23 -74.088e-24 -74.088e-24 -74.088e-24 -74.088e-24 -74.08800e-24 -74.08800e-24 -074.088e-24 -074.088e-24 -74.08800e-24 -74.08800e-24 -74.088e-24 -74.088e-24 -74.08800e-24 -74.08800e-24 -74.088e-24 -74.088e-24 -74.08800e-24 -74.08800e-24 +-3.111696e-21 -3.1117e-21 -3.1117e-21 -3.1117e-21 -3.1117e-21 -3.11170e-21 -3.11170e-21 -03.1117e-21 -03.1117e-21 -3.11170e-21 -3.11170e-21 -3.1117e-21 -3.1117e-21 -3.11170e-21 -3.11170e-21 -3.1117e-21 -3.1117e-21 -3.11170e-21 -3.11170e-21 +-1.30691232e-19 -130.691e-21 -130.691e-21 -130.69e-21 -130.69e-21 -130.69123e-21 -130.69123e-21 -0130.69e-21 -0130.69e-21 -130.69123e-21 -130.69123e-21 -130.69e-21 -130.69e-21 -130.69123e-21 -130.69123e-21 -130.69e-21 -130.69e-21 -130.69123e-21 -130.69123e-21 +-5.489031744e-18 -5.48903e-18 -5.48903e-18 -5.489e-18 -5.489e-18 -5.48903e-18 -5.48903e-18 -005.489e-18 -005.489e-18 -5.48903e-18 -5.48903e-18 -5.489e-18 -5.489e-18 -5.48903e-18 -5.48903e-18 -5.489e-18 -5.489e-18 -5.48903e-18 -5.48903e-18 +-2.30539333248e-16 -230.539e-18 -230.539e-18 -230.54e-18 -230.54e-18 -230.53933e-18 -230.53933e-18 -0230.54e-18 -0230.54e-18 -230.53933e-18 -230.53933e-18 -230.54e-18 -230.54e-18 -230.53933e-18 -230.53933e-18 -230.54e-18 -230.54e-18 -230.53933e-18 -230.53933e-18 +-9.682651996416e-15 -9.68265e-15 -9.68265e-15 -9.6827e-15 -9.6827e-15 -9.68265e-15 -9.68265e-15 -09.6827e-15 -09.6827e-15 -9.68265e-15 -9.68265e-15 -9.6827e-15 -9.6827e-15 -9.68265e-15 -9.68265e-15 -9.6827e-15 -9.6827e-15 -9.68265e-15 -9.68265e-15 +-4.06671383849472e-13 -406.671e-15 -406.671e-15 -406.67e-15 -406.67e-15 -406.67138e-15 -406.67138e-15 -0406.67e-15 -0406.67e-15 -406.67138e-15 -406.67138e-15 -406.67e-15 -406.67e-15 -406.67138e-15 -406.67138e-15 -406.67e-15 -406.67e-15 -406.67138e-15 -406.67138e-15 +-1.70801981216778e-11 -17.0802e-12 -17.0802e-12 -17.08e-12 -17.08e-12 -17.08020e-12 -17.08020e-12 -0017.08e-12 -0017.08e-12 -17.08020e-12 -17.08020e-12 -17.08e-12 -17.08e-12 -17.08020e-12 -17.08020e-12 -17.08e-12 -17.08e-12 -17.08020e-12 -17.08020e-12 +-7.17368321110469e-10 -717.368e-12 -717.368e-12 -717.37e-12 -717.37e-12 -717.36832e-12 -717.36832e-12 -0717.37e-12 -0717.37e-12 -717.36832e-12 -717.36832e-12 -717.37e-12 -717.37e-12 -717.36832e-12 -717.36832e-12 -717.37e-12 -717.37e-12 -717.36832e-12 -717.36832e-12 +-3.01294694866397e-08 -30.1295e-9 -30.1295e-9 -30.129e-9 -30.129e-9 -30.12947e-9 -30.12947e-9 -0030.129e-9 -0030.129e-9 -30.12947e-9 -30.12947e-9 -30.129e-9 -30.129e-9 -30.12947e-9 -30.12947e-9 -30.129e-9 -30.129e-9 -30.12947e-9 -30.12947e-9 +-1.26543771843887e-06 -1.26544e-6 -1.26544e-6 -1.2654e-6 -1.2654e-6 -1.26544e-6 -1.26544e-6 -001.2654e-6 -001.2654e-6 -01.26544e-6 -01.26544e-6 -1.2654e-6 -1.2654e-6 -1.26544e-6 -1.26544e-6 -1.2654e-6 -1.2654e-6 -1.26544e-6 -1.26544e-6 +-5.31483841744324e-05 -53.1484e-6 -53.1484e-6 -53.148e-6 -53.148e-6 -53.14838e-6 -53.14838e-6 -0053.148e-6 -0053.148e-6 -53.14838e-6 -53.14838e-6 -53.148e-6 -53.148e-6 -53.14838e-6 -53.14838e-6 -53.148e-6 -53.148e-6 -53.14838e-6 -53.14838e-6 +-0.00223223213532616 -2.23223e-3 -2.23223e-3 -2.2322e-3 -2.2322e-3 -2.23223e-3 -2.23223e-3 -002.2322e-3 -002.2322e-3 -02.23223e-3 -02.23223e-3 -2.2322e-3 -2.2322e-3 -2.23223e-3 -2.23223e-3 -2.2322e-3 -2.2322e-3 -2.23223e-3 -2.23223e-3 +-0.0937537496836987 -93.7537e-3 -93.7537e-3 -93.754e-3 -93.754e-3 -93.75375e-3 -93.75375e-3 -0093.754e-3 -0093.754e-3 -93.75375e-3 -93.75375e-3 -93.754e-3 -93.754e-3 -93.75375e-3 -93.75375e-3 -93.754e-3 -93.754e-3 -93.75375e-3 -93.75375e-3 +-3.93765748671535 -3.93766e0 -3.93766e0 -3.9377e0 -3.9377e0 -3.93766e0 -3.93766e0 -0003.9377e0 -0003.9377e0 -003.93766e0 -003.93766e0 -3.9377e0 -3.9377e0 -3.93766e0 -3.93766e0 -3.9377e0 -3.9377e0 -3.93766e0 -3.93766e0 +-165.381614442045 -165.382e0 -165.382e0 -165.38e0 -165.38e0 -165.38161e0 -165.38161e0 -000165.38e0 -000165.38e0 -165.38161e0 -165.38161e0 -165.38e0 -165.38e0 -165.38161e0 -165.38161e0 -165.38e0 -165.38e0 -165.38161e0 -165.38161e0 +-6946.02780656587 -6.94603e3 -6.94603e3 -6.946e3 -6.946e3 -6.94603e3 -6.94603e3 -00006.946e3 -00006.946e3 -006.94603e3 -006.94603e3 -6.946e3 -6.946e3 -6.94603e3 -6.94603e3 -6.946e3 -6.946e3 -6.94603e3 -6.94603e3 +-291733.167875767 -291.733e3 -291.733e3 -291.73e3 -291.73e3 -291.73317e3 -291.73317e3 -000291.73e3 -000291.73e3 -291.73317e3 -291.73317e3 -291.73e3 -291.73e3 -291.73317e3 -291.73317e3 -291.73e3 -291.73e3 -291.73317e3 -291.73317e3 +-12252793.0507822 -12.2528e6 -12.2528e6 -12.253e6 -12.253e6 -12.25279e6 -12.25279e6 -00012.253e6 -00012.253e6 -012.25279e6 -012.25279e6 -12.253e6 -12.253e6 -12.25279e6 -12.25279e6 -12.253e6 -12.253e6 -12.25279e6 -12.25279e6 +-514617308.132852 -514.617e6 -514.617e6 -514.62e6 -514.62e6 -514.61731e6 -514.61731e6 -000514.62e6 -000514.62e6 -514.61731e6 -514.61731e6 -514.62e6 -514.62e6 -514.61731e6 -514.61731e6 -514.62e6 -514.62e6 -514.61731e6 -514.61731e6 +-21613926941.5798 -21.6139e9 -21.6139e9 -21.614e9 -21.614e9 -21.61393e9 -21.61393e9 -00021.614e9 -00021.614e9 -021.61393e9 -021.61393e9 -21.614e9 -21.614e9 -21.61393e9 -21.61393e9 -21.614e9 -21.614e9 -21.61393e9 -21.61393e9 +-907784931546.352 -907.785e9 -907.785e9 -907.78e9 -907.78e9 -907.78493e9 -907.78493e9 -000907.78e9 -000907.78e9 -907.78493e9 -907.78493e9 -907.78e9 -907.78e9 -907.78493e9 -907.78493e9 -907.78e9 -907.78e9 -907.78493e9 -907.78493e9 +-38126967124946.8 -38.127e12 -38.127e12 -38.127e12 -38.127e12 -38.12697e12 -38.12697e12 -0038.127e12 -0038.127e12 -38.12697e12 -38.12697e12 -38.127e12 -38.127e12 -38.12697e12 -38.12697e12 -38.127e12 -38.127e12 -38.12697e12 -38.12697e12 +-1.60133261924776e+15 -1.60133e15 -1.60133e15 -1.6013e15 -1.6013e15 -1.60133e15 -1.60133e15 -001.6013e15 -001.6013e15 -01.60133e15 -01.60133e15 -1.6013e15 -1.6013e15 -1.60133e15 -1.60133e15 -1.6013e15 -1.6013e15 -1.60133e15 -1.60133e15 +-6.72559700084061e+16 -67.256e15 -67.256e15 -67.256e15 -67.256e15 -67.25597e15 -67.25597e15 -0067.256e15 -0067.256e15 -67.25597e15 -67.25597e15 -67.256e15 -67.256e15 -67.25597e15 -67.25597e15 -67.256e15 -67.256e15 -67.25597e15 -67.25597e15 +-2.82475074035306e+18 -2.82475e18 -2.82475e18 -2.8248e18 -2.8248e18 -2.82475e18 -2.82475e18 -002.8248e18 -002.8248e18 -02.82475e18 -02.82475e18 -2.8248e18 -2.8248e18 -2.82475e18 -2.82475e18 -2.8248e18 -2.8248e18 -2.82475e18 -2.82475e18 +-1.18639531094828e+20 -118.64e18 -118.64e18 -118.64e18 -118.64e18 -118.63953e18 -118.63953e18 -00118.64e18 -00118.64e18 -118.63953e18 -118.63953e18 -118.64e18 -118.64e18 -118.63953e18 -118.63953e18 -118.64e18 -118.64e18 -118.63953e18 -118.63953e18 +-4.98286030598279e+21 -4.98286e21 -4.98286e21 -4.9829e21 -4.9829e21 -4.98286e21 -4.98286e21 -004.9829e21 -004.9829e21 -04.98286e21 -04.98286e21 -4.9829e21 -4.9829e21 -4.98286e21 -4.98286e21 -4.9829e21 -4.9829e21 -4.98286e21 -4.98286e21 +-2.09280132851277e+23 -209.28e21 -209.28e21 -209.28e21 -209.28e21 -209.28013e21 -209.28013e21 -00209.28e21 -00209.28e21 -209.28013e21 -209.28013e21 -209.28e21 -209.28e21 -209.28013e21 -209.28013e21 -209.28e21 -209.28e21 -209.28013e21 -209.28013e21 +-8.78976557975365e+24 -8.78977e24 -8.78977e24 -8.7898e24 -8.7898e24 -8.78977e24 -8.78977e24 -008.7898e24 -008.7898e24 -08.78977e24 -08.78977e24 -8.7898e24 -8.7898e24 -8.78977e24 -8.78977e24 -8.7898e24 -8.7898e24 -8.78977e24 -8.78977e24 +-3.69170154349653e+26 -369.17e24 -369.17e24 -369.17e24 -369.17e24 -369.17015e24 -369.17015e24 -00369.17e24 -00369.17e24 -369.17015e24 -369.17015e24 -369.17e24 -369.17e24 -369.17015e24 -369.17015e24 -369.17e24 -369.17e24 -369.17015e24 -369.17015e24 +-1.55051464826854e+28 -15.5051e27 -15.5051e27 -15.505e27 -15.505e27 -15.50515e27 -15.50515e27 -0015.505e27 -0015.505e27 -15.50515e27 -15.50515e27 -15.505e27 -15.505e27 -15.50515e27 -15.50515e27 -15.505e27 -15.505e27 -15.50515e27 -15.50515e27 +-6.51216152272788e+29 -651.216e27 -651.216e27 -651.22e27 -651.22e27 -651.21615e27 -651.21615e27 -00651.22e27 -00651.22e27 -651.21615e27 -651.21615e27 -651.22e27 -651.22e27 -651.21615e27 -651.21615e27 -651.22e27 -651.22e27 -651.21615e27 -651.21615e27 Index: sts/io/.expect/manipulatorsOutput4.x64.txt =================================================================== --- tests/io/.expect/manipulatorsOutput4.x64.txt (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ (revision ) @@ -1,226 +1,0 @@ -1e-27 1e-27 +1e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 00000001e-27 +0000001e-27 01.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 -1e-26 10e-27 +10e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 00000010e-27 +0000010e-27 10.00000e-27 +10.00000e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 -1e-25 100e-27 +100e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 00000100e-27 +0000100e-27 100.00000e-27 +100.00000e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 -1e-24 1e-24 +1e-24 1e-24 +1e-24 1.00000e-24 +1.00000e-24 00000001e-24 +0000001e-24 01.00000e-24 +1.00000e-24 1e-24 +1e-24 1.00000e-24 +1.00000e-24 1e-24 +1e-24 1.00000e-24 +1.00000e-24 -1e-23 10e-24 +10e-24 10e-24 +10e-24 10.00000e-24 +10.00000e-24 00000010e-24 +0000010e-24 10.00000e-24 +10.00000e-24 10e-24 +10e-24 10.00000e-24 +10.00000e-24 10e-24 +10e-24 10.00000e-24 +10.00000e-24 -1e-22 100e-24 +100e-24 100e-24 +100e-24 100.00000e-24 +100.00000e-24 00000100e-24 +0000100e-24 100.00000e-24 +100.00000e-24 100e-24 +100e-24 100.00000e-24 +100.00000e-24 100e-24 +100e-24 100.00000e-24 +100.00000e-24 -1e-21 1e-21 +1e-21 1e-21 +1e-21 1.00000e-21 +1.00000e-21 00000001e-21 +0000001e-21 01.00000e-21 +1.00000e-21 1e-21 +1e-21 1.00000e-21 +1.00000e-21 1e-21 +1e-21 1.00000e-21 +1.00000e-21 -1e-20 10e-21 +10e-21 10e-21 +10e-21 10.00000e-21 +10.00000e-21 00000010e-21 +0000010e-21 10.00000e-21 +10.00000e-21 10e-21 +10e-21 10.00000e-21 +10.00000e-21 10e-21 +10e-21 10.00000e-21 +10.00000e-21 -1e-19 100e-21 +100e-21 100e-21 +100e-21 100.00000e-21 +100.00000e-21 00000100e-21 +0000100e-21 100.00000e-21 +100.00000e-21 100e-21 +100e-21 100.00000e-21 +100.00000e-21 100e-21 +100e-21 100.00000e-21 +100.00000e-21 -1e-18 1e-18 +1e-18 1e-18 +1e-18 1.00000e-18 +1.00000e-18 00000001e-18 +0000001e-18 01.00000e-18 +1.00000e-18 1e-18 +1e-18 1.00000e-18 +1.00000e-18 1e-18 +1e-18 1.00000e-18 +1.00000e-18 -1e-17 10e-18 +10e-18 10e-18 +10e-18 10.00000e-18 +10.00000e-18 00000010e-18 +0000010e-18 10.00000e-18 +10.00000e-18 10e-18 +10e-18 10.00000e-18 +10.00000e-18 10e-18 +10e-18 10.00000e-18 +10.00000e-18 -1e-16 100e-18 +100e-18 100e-18 +100e-18 100.00000e-18 +100.00000e-18 00000100e-18 +0000100e-18 100.00000e-18 +100.00000e-18 100e-18 +100e-18 100.00000e-18 +100.00000e-18 100e-18 +100e-18 100.00000e-18 +100.00000e-18 -1e-15 1e-15 +1e-15 1e-15 +1e-15 1.00000e-15 +1.00000e-15 00000001e-15 +0000001e-15 01.00000e-15 +1.00000e-15 1e-15 +1e-15 1.00000e-15 +1.00000e-15 1e-15 +1e-15 1.00000e-15 +1.00000e-15 -1e-14 10e-15 +10e-15 10e-15 +10e-15 10.00000e-15 +10.00000e-15 00000010e-15 +0000010e-15 10.00000e-15 +10.00000e-15 10e-15 +10e-15 10.00000e-15 +10.00000e-15 10e-15 +10e-15 10.00000e-15 +10.00000e-15 -1e-13 100e-15 +100e-15 100e-15 +100e-15 100.00000e-15 +100.00000e-15 00000100e-15 +0000100e-15 100.00000e-15 +100.00000e-15 100e-15 +100e-15 100.00000e-15 +100.00000e-15 100e-15 +100e-15 100.00000e-15 +100.00000e-15 -1e-12 1e-12 +1e-12 1e-12 +1e-12 1.00000e-12 +1.00000e-12 00000001e-12 +0000001e-12 01.00000e-12 +1.00000e-12 1e-12 +1e-12 1.00000e-12 +1.00000e-12 1e-12 +1e-12 1.00000e-12 +1.00000e-12 -1e-11 10e-12 +10e-12 10e-12 +10e-12 10.00000e-12 +10.00000e-12 00000010e-12 +0000010e-12 10.00000e-12 +10.00000e-12 10e-12 +10e-12 10.00000e-12 +10.00000e-12 10e-12 +10e-12 10.00000e-12 +10.00000e-12 -1e-10 100e-12 +100e-12 100e-12 +100e-12 100.00000e-12 +100.00000e-12 00000100e-12 +0000100e-12 100.00000e-12 +100.00000e-12 100e-12 +100e-12 100.00000e-12 +100.00000e-12 100e-12 +100e-12 100.00000e-12 +100.00000e-12 -1e-09 1e-9 +1e-9 1e-9 +1e-9 1.00000e-9 +1.00000e-9 000000001e-9 +00000001e-9 001.00000e-9 +01.00000e-9 1e-9 +1e-9 1.00000e-9 +1.00000e-9 1e-9 +1e-9 1.00000e-9 +1.00000e-9 -1e-08 10e-9 +10e-9 10e-9 +10e-9 10.00000e-9 +10.00000e-9 000000010e-9 +00000010e-9 010.00000e-9 +10.00000e-9 10e-9 +10e-9 10.00000e-9 +10.00000e-9 10e-9 +10e-9 10.00000e-9 +10.00000e-9 -1e-07 100e-9 +100e-9 100e-9 +100e-9 100.00000e-9 +100.00000e-9 000000100e-9 +00000100e-9 100.00000e-9 +100.00000e-9 100e-9 +100e-9 100.00000e-9 +100.00000e-9 100e-9 +100e-9 100.00000e-9 +100.00000e-9 -1e-06 1e-6 +1e-6 1e-6 +1e-6 1.00000e-6 +1.00000e-6 000000001e-6 +00000001e-6 001.00000e-6 +01.00000e-6 1e-6 +1e-6 1.00000e-6 +1.00000e-6 1e-6 +1e-6 1.00000e-6 +1.00000e-6 -1e-05 10e-6 +10e-6 10e-6 +10e-6 10.00000e-6 +10.00000e-6 000000010e-6 +00000010e-6 010.00000e-6 +10.00000e-6 10e-6 +10e-6 10.00000e-6 +10.00000e-6 10e-6 +10e-6 10.00000e-6 +10.00000e-6 -0.0001 100e-6 +100e-6 100e-6 +100e-6 100.00000e-6 +100.00000e-6 000000100e-6 +00000100e-6 100.00000e-6 +100.00000e-6 100e-6 +100e-6 100.00000e-6 +100.00000e-6 100e-6 +100e-6 100.00000e-6 +100.00000e-6 -0.001 1e-3 +1e-3 1e-3 +1e-3 1.00000e-3 +1.00000e-3 000000001e-3 +00000001e-3 001.00000e-3 +01.00000e-3 1e-3 +1e-3 1.00000e-3 +1.00000e-3 1e-3 +1e-3 1.00000e-3 +1.00000e-3 -0.01 10e-3 +10e-3 10e-3 +10e-3 10.00000e-3 +10.00000e-3 000000010e-3 +00000010e-3 010.00000e-3 +10.00000e-3 10e-3 +10e-3 10.00000e-3 +10.00000e-3 10e-3 +10e-3 10.00000e-3 +10.00000e-3 -0.1 100e-3 +100e-3 100e-3 +100e-3 100.00000e-3 +100.00000e-3 000000100e-3 +00000100e-3 100.00000e-3 +100.00000e-3 100e-3 +100e-3 100.00000e-3 +100.00000e-3 100e-3 +100e-3 100.00000e-3 +100.00000e-3 -1. 1e0 +1e0 1e0 +1e0 1.00000e0 +1.00000e0 0000000001e0 +000000001e0 0001.00000e0 +001.00000e0 1e0 +1e0 1.00000e0 +1.00000e0 1e0 +1e0 1.00000e0 +1.00000e0 -10. 10e0 +10e0 10e0 +10e0 10.00000e0 +10.00000e0 0000000010e0 +000000010e0 0010.00000e0 +010.00000e0 10e0 +10e0 10.00000e0 +10.00000e0 10e0 +10e0 10.00000e0 +10.00000e0 -100. 100e0 +100e0 100e0 +100e0 100.00000e0 +100.00000e0 0000000100e0 +000000100e0 0100.00000e0 +100.00000e0 100e0 +100e0 100.00000e0 +100.00000e0 100e0 +100e0 100.00000e0 +100.00000e0 -1000. 1e3 +1e3 1e3 +1e3 1.00000e3 +1.00000e3 0000000001e3 +000000001e3 0001.00000e3 +001.00000e3 1e3 +1e3 1.00000e3 +1.00000e3 1e3 +1e3 1.00000e3 +1.00000e3 -10000. 10e3 +10e3 10e3 +10e3 10.00000e3 +10.00000e3 0000000010e3 +000000010e3 0010.00000e3 +010.00000e3 10e3 +10e3 10.00000e3 +10.00000e3 10e3 +10e3 10.00000e3 +10.00000e3 -100000. 100e3 +100e3 100e3 +100e3 100.00000e3 +100.00000e3 0000000100e3 +000000100e3 0100.00000e3 +100.00000e3 100e3 +100e3 100.00000e3 +100.00000e3 100e3 +100e3 100.00000e3 +100.00000e3 -1000000. 1e6 +1e6 1e6 +1e6 1.00000e6 +1.00000e6 0000000001e6 +000000001e6 0001.00000e6 +001.00000e6 1e6 +1e6 1.00000e6 +1.00000e6 1e6 +1e6 1.00000e6 +1.00000e6 -10000000. 10e6 +10e6 10e6 +10e6 10.00000e6 +10.00000e6 0000000010e6 +000000010e6 0010.00000e6 +010.00000e6 10e6 +10e6 10.00000e6 +10.00000e6 10e6 +10e6 10.00000e6 +10.00000e6 -100000000. 100e6 +100e6 100e6 +100e6 100.00000e6 +100.00000e6 0000000100e6 +000000100e6 0100.00000e6 +100.00000e6 100e6 +100e6 100.00000e6 +100.00000e6 100e6 +100e6 100.00000e6 +100.00000e6 -1000000000. 1e9 +1e9 1e9 +1e9 1.00000e9 +1.00000e9 0000000001e9 +000000001e9 0001.00000e9 +001.00000e9 1e9 +1e9 1.00000e9 +1.00000e9 1e9 +1e9 1.00000e9 +1.00000e9 -10000000000. 10e9 +10e9 10e9 +10e9 10.00000e9 +10.00000e9 0000000010e9 +000000010e9 0010.00000e9 +010.00000e9 10e9 +10e9 10.00000e9 +10.00000e9 10e9 +10e9 10.00000e9 +10.00000e9 -100000000000. 100e9 +100e9 100e9 +100e9 100.00000e9 +100.00000e9 0000000100e9 +000000100e9 0100.00000e9 +100.00000e9 100e9 +100e9 100.00000e9 +100.00000e9 100e9 +100e9 100.00000e9 +100.00000e9 -1000000000000. 1e12 +1e12 1e12 +1e12 1.00000e12 +1.00000e12 000000001e12 +00000001e12 001.00000e12 +01.00000e12 1e12 +1e12 1.00000e12 +1.00000e12 1e12 +1e12 1.00000e12 +1.00000e12 -10000000000000. 10e12 +10e12 10e12 +10e12 10.00000e12 +10.00000e12 000000010e12 +00000010e12 010.00000e12 +10.00000e12 10e12 +10e12 10.00000e12 +10.00000e12 10e12 +10e12 10.00000e12 +10.00000e12 -100000000000000. 100e12 +100e12 100e12 +100e12 100.00000e12 +100.00000e12 000000100e12 +00000100e12 100.00000e12 +100.00000e12 100e12 +100e12 100.00000e12 +100.00000e12 100e12 +100e12 100.00000e12 +100.00000e12 -1e+15 1e15 +1e15 1e15 +1e15 1.00000e15 +1.00000e15 000000001e15 +00000001e15 001.00000e15 +01.00000e15 1e15 +1e15 1.00000e15 +1.00000e15 1e15 +1e15 1.00000e15 +1.00000e15 -1e+16 10e15 +10e15 10e15 +10e15 10.00000e15 +10.00000e15 000000010e15 +00000010e15 010.00000e15 +10.00000e15 10e15 +10e15 10.00000e15 +10.00000e15 10e15 +10e15 10.00000e15 +10.00000e15 -1e+17 100e15 +100e15 100e15 +100e15 100.00000e15 +100.00000e15 000000100e15 +00000100e15 100.00000e15 +100.00000e15 100e15 +100e15 100.00000e15 +100.00000e15 100e15 +100e15 100.00000e15 +100.00000e15 -1e+18 1e18 +1e18 1e18 +1e18 1.00000e18 +1.00000e18 000000001e18 +00000001e18 001.00000e18 +01.00000e18 1e18 +1e18 1.00000e18 +1.00000e18 1e18 +1e18 1.00000e18 +1.00000e18 -1e+19 10e18 +10e18 10e18 +10e18 10.00000e18 +10.00000e18 000000010e18 +00000010e18 010.00000e18 +10.00000e18 10e18 +10e18 10.00000e18 +10.00000e18 10e18 +10e18 10.00000e18 +10.00000e18 -1e+20 100e18 +100e18 100e18 +100e18 100.00000e18 +100.00000e18 000000100e18 +00000100e18 100.00000e18 +100.00000e18 100e18 +100e18 100.00000e18 +100.00000e18 100e18 +100e18 100.00000e18 +100.00000e18 -1e+21 1e21 +1e21 1e21 +1e21 1.00000e21 +1.00000e21 000000001e21 +00000001e21 001.00000e21 +01.00000e21 1e21 +1e21 1.00000e21 +1.00000e21 1e21 +1e21 1.00000e21 +1.00000e21 -1e+22 10e21 +10e21 10e21 +10e21 10.00000e21 +10.00000e21 000000010e21 +00000010e21 010.00000e21 +10.00000e21 10e21 +10e21 10.00000e21 +10.00000e21 10e21 +10e21 10.00000e21 +10.00000e21 -1e+23 100e21 +100e21 100e21 +100e21 100.00000e21 +100.00000e21 000000100e21 +00000100e21 100.00000e21 +100.00000e21 100e21 +100e21 100.00000e21 +100.00000e21 100e21 +100e21 100.00000e21 +100.00000e21 -1e+24 1e24 +1e24 1e24 +1e24 1.00000e24 +1.00000e24 000000001e24 +00000001e24 001.00000e24 +01.00000e24 1e24 +1e24 1.00000e24 +1.00000e24 1e24 +1e24 1.00000e24 +1.00000e24 -1e+25 10e24 +10e24 10e24 +10e24 10.00000e24 +10.00000e24 000000010e24 +00000010e24 010.00000e24 +10.00000e24 10e24 +10e24 10.00000e24 +10.00000e24 10e24 +10e24 10.00000e24 +10.00000e24 -1e+26 100e24 +100e24 100e24 +100e24 100.00000e24 +100.00000e24 000000100e24 +00000100e24 100.00000e24 +100.00000e24 100e24 +100e24 100.00000e24 +100.00000e24 100e24 +100e24 100.00000e24 +100.00000e24 -1e+27 1e27 +1e27 1e27 +1e27 1.00000e27 +1.00000e27 000000001e27 +00000001e27 001.00000e27 +01.00000e27 1e27 +1e27 1.00000e27 +1.00000e27 1e27 +1e27 1.00000e27 +1.00000e27 -1e+28 10e27 +10e27 10e27 +10e27 10.00000e27 +10.00000e27 000000010e27 +00000010e27 010.00000e27 +10.00000e27 10e27 +10e27 10.00000e27 +10.00000e27 10e27 +10e27 10.00000e27 +10.00000e27 -1e+29 100e27 +100e27 100e27 +100e27 100.00000e27 +100.00000e27 000000100e27 +00000100e27 100.00000e27 +100.00000e27 100e27 +100e27 100.00000e27 +100.00000e27 100e27 +100e27 100.00000e27 +100.00000e27 - -1e-27 1e-27 +1e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 00000001e-27 +0000001e-27 01.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 -4.2e-26 42e-27 +42e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 00000042e-27 +0000042e-27 42.00000e-27 +42.00000e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 -1.764e-24 1.764e-24 +1.764e-24 1.764e-24 +1.764e-24 1.76400e-24 +1.76400e-24 0001.764e-24 +001.764e-24 01.76400e-24 +1.76400e-24 1.764e-24 +1.764e-24 1.76400e-24 +1.76400e-24 1.764e-24 +1.764e-24 1.76400e-24 +1.76400e-24 -7.4088e-23 74.088e-24 +74.088e-24 74.088e-24 +74.088e-24 74.08800e-24 +74.08800e-24 0074.088e-24 +074.088e-24 74.08800e-24 +74.08800e-24 74.088e-24 +74.088e-24 74.08800e-24 +74.08800e-24 74.088e-24 +74.088e-24 74.08800e-24 +74.08800e-24 -3.111696e-21 3.1117e-21 +3.1117e-21 3.1117e-21 +3.1117e-21 3.11170e-21 +3.11170e-21 003.1117e-21 +03.1117e-21 03.11170e-21 +3.11170e-21 3.1117e-21 +3.1117e-21 3.11170e-21 +3.11170e-21 3.1117e-21 +3.1117e-21 3.11170e-21 +3.11170e-21 -1.30691232e-19 130.691e-21 +130.691e-21 130.69e-21 +130.69e-21 130.69123e-21 +130.69123e-21 00130.69e-21 +0130.69e-21 130.69123e-21 +130.69123e-21 130.69e-21 +130.69e-21 130.69123e-21 +130.69123e-21 130.69e-21 +130.69e-21 130.69123e-21 +130.69123e-21 -5.489031744e-18 5.48903e-18 +5.48903e-18 5.489e-18 +5.489e-18 5.48903e-18 +5.48903e-18 0005.489e-18 +005.489e-18 05.48903e-18 +5.48903e-18 5.489e-18 +5.489e-18 5.48903e-18 +5.48903e-18 5.489e-18 +5.489e-18 5.48903e-18 +5.48903e-18 -2.30539333248e-16 230.539e-18 +230.539e-18 230.54e-18 +230.54e-18 230.53933e-18 +230.53933e-18 00230.54e-18 +0230.54e-18 230.53933e-18 +230.53933e-18 230.54e-18 +230.54e-18 230.53933e-18 +230.53933e-18 230.54e-18 +230.54e-18 230.53933e-18 +230.53933e-18 -9.682651996416e-15 9.68265e-15 +9.68265e-15 9.6827e-15 +9.6827e-15 9.68265e-15 +9.68265e-15 009.6827e-15 +09.6827e-15 09.68265e-15 +9.68265e-15 9.6827e-15 +9.6827e-15 9.68265e-15 +9.68265e-15 9.6827e-15 +9.6827e-15 9.68265e-15 +9.68265e-15 -4.06671383849472e-13 406.671e-15 +406.671e-15 406.67e-15 +406.67e-15 406.67138e-15 +406.67138e-15 00406.67e-15 +0406.67e-15 406.67138e-15 +406.67138e-15 406.67e-15 +406.67e-15 406.67138e-15 +406.67138e-15 406.67e-15 +406.67e-15 406.67138e-15 +406.67138e-15 -1.70801981216778e-11 17.0802e-12 +17.0802e-12 17.08e-12 +17.08e-12 17.08020e-12 +17.08020e-12 00017.08e-12 +0017.08e-12 17.08020e-12 +17.08020e-12 17.08e-12 +17.08e-12 17.08020e-12 +17.08020e-12 17.08e-12 +17.08e-12 17.08020e-12 +17.08020e-12 -7.17368321110469e-10 717.368e-12 +717.368e-12 717.37e-12 +717.37e-12 717.36832e-12 +717.36832e-12 00717.37e-12 +0717.37e-12 717.36832e-12 +717.36832e-12 717.37e-12 +717.37e-12 717.36832e-12 +717.36832e-12 717.37e-12 +717.37e-12 717.36832e-12 +717.36832e-12 -3.01294694866397e-08 30.1295e-9 +30.1295e-9 30.129e-9 +30.129e-9 30.12947e-9 +30.12947e-9 00030.129e-9 +0030.129e-9 030.12947e-9 +30.12947e-9 30.129e-9 +30.129e-9 30.12947e-9 +30.12947e-9 30.129e-9 +30.129e-9 30.12947e-9 +30.12947e-9 -1.26543771843887e-06 1.26544e-6 +1.26544e-6 1.2654e-6 +1.2654e-6 1.26544e-6 +1.26544e-6 0001.2654e-6 +001.2654e-6 001.26544e-6 +01.26544e-6 1.2654e-6 +1.2654e-6 1.26544e-6 +1.26544e-6 1.2654e-6 +1.2654e-6 1.26544e-6 +1.26544e-6 -5.31483841744324e-05 53.1484e-6 +53.1484e-6 53.148e-6 +53.148e-6 53.14838e-6 +53.14838e-6 00053.148e-6 +0053.148e-6 053.14838e-6 +53.14838e-6 53.148e-6 +53.148e-6 53.14838e-6 +53.14838e-6 53.148e-6 +53.148e-6 53.14838e-6 +53.14838e-6 -0.00223223213532616 2.23223e-3 +2.23223e-3 2.2322e-3 +2.2322e-3 2.23223e-3 +2.23223e-3 0002.2322e-3 +002.2322e-3 002.23223e-3 +02.23223e-3 2.2322e-3 +2.2322e-3 2.23223e-3 +2.23223e-3 2.2322e-3 +2.2322e-3 2.23223e-3 +2.23223e-3 -0.0937537496836987 93.7537e-3 +93.7537e-3 93.754e-3 +93.754e-3 93.75375e-3 +93.75375e-3 00093.754e-3 +0093.754e-3 093.75375e-3 +93.75375e-3 93.754e-3 +93.754e-3 93.75375e-3 +93.75375e-3 93.754e-3 +93.754e-3 93.75375e-3 +93.75375e-3 -3.93765748671535 3.93766e0 +3.93766e0 3.9377e0 +3.9377e0 3.93766e0 +3.93766e0 00003.9377e0 +0003.9377e0 0003.93766e0 +003.93766e0 3.9377e0 +3.9377e0 3.93766e0 +3.93766e0 3.9377e0 +3.9377e0 3.93766e0 +3.93766e0 -165.381614442045 165.382e0 +165.382e0 165.38e0 +165.38e0 165.38161e0 +165.38161e0 0000165.38e0 +000165.38e0 0165.38161e0 +165.38161e0 165.38e0 +165.38e0 165.38161e0 +165.38161e0 165.38e0 +165.38e0 165.38161e0 +165.38161e0 -6946.02780656587 6.94603e3 +6.94603e3 6.946e3 +6.946e3 6.94603e3 +6.94603e3 000006.946e3 +00006.946e3 0006.94603e3 +006.94603e3 6.946e3 +6.946e3 6.94603e3 +6.94603e3 6.946e3 +6.946e3 6.94603e3 +6.94603e3 -291733.167875767 291.733e3 +291.733e3 291.73e3 +291.73e3 291.73317e3 +291.73317e3 0000291.73e3 +000291.73e3 0291.73317e3 +291.73317e3 291.73e3 +291.73e3 291.73317e3 +291.73317e3 291.73e3 +291.73e3 291.73317e3 +291.73317e3 -12252793.0507822 12.2528e6 +12.2528e6 12.253e6 +12.253e6 12.25279e6 +12.25279e6 000012.253e6 +00012.253e6 0012.25279e6 +012.25279e6 12.253e6 +12.253e6 12.25279e6 +12.25279e6 12.253e6 +12.253e6 12.25279e6 +12.25279e6 -514617308.132852 514.617e6 +514.617e6 514.62e6 +514.62e6 514.61731e6 +514.61731e6 0000514.62e6 +000514.62e6 0514.61731e6 +514.61731e6 514.62e6 +514.62e6 514.61731e6 +514.61731e6 514.62e6 +514.62e6 514.61731e6 +514.61731e6 -21613926941.5798 21.6139e9 +21.6139e9 21.614e9 +21.614e9 21.61393e9 +21.61393e9 000021.614e9 +00021.614e9 0021.61393e9 +021.61393e9 21.614e9 +21.614e9 21.61393e9 +21.61393e9 21.614e9 +21.614e9 21.61393e9 +21.61393e9 -907784931546.352 907.785e9 +907.785e9 907.78e9 +907.78e9 907.78493e9 +907.78493e9 0000907.78e9 +000907.78e9 0907.78493e9 +907.78493e9 907.78e9 +907.78e9 907.78493e9 +907.78493e9 907.78e9 +907.78e9 907.78493e9 +907.78493e9 -38126967124946.8 38.127e12 +38.127e12 38.127e12 +38.127e12 38.12697e12 +38.12697e12 00038.127e12 +0038.127e12 038.12697e12 +38.12697e12 38.127e12 +38.127e12 38.12697e12 +38.12697e12 38.127e12 +38.127e12 38.12697e12 +38.12697e12 -1.60133261924776e+15 1.60133e15 +1.60133e15 1.6013e15 +1.6013e15 1.60133e15 +1.60133e15 0001.6013e15 +001.6013e15 001.60133e15 +01.60133e15 1.6013e15 +1.6013e15 1.60133e15 +1.60133e15 1.6013e15 +1.6013e15 1.60133e15 +1.60133e15 -6.72559700084061e+16 67.256e15 +67.256e15 67.256e15 +67.256e15 67.25597e15 +67.25597e15 00067.256e15 +0067.256e15 067.25597e15 +67.25597e15 67.256e15 +67.256e15 67.25597e15 +67.25597e15 67.256e15 +67.256e15 67.25597e15 +67.25597e15 -2.82475074035306e+18 2.82475e18 +2.82475e18 2.8248e18 +2.8248e18 2.82475e18 +2.82475e18 0002.8248e18 +002.8248e18 002.82475e18 +02.82475e18 2.8248e18 +2.8248e18 2.82475e18 +2.82475e18 2.8248e18 +2.8248e18 2.82475e18 +2.82475e18 -1.18639531094828e+20 118.64e18 +118.64e18 118.64e18 +118.64e18 118.63953e18 +118.63953e18 000118.64e18 +00118.64e18 118.63953e18 +118.63953e18 118.64e18 +118.64e18 118.63953e18 +118.63953e18 118.64e18 +118.64e18 118.63953e18 +118.63953e18 -4.98286030598279e+21 4.98286e21 +4.98286e21 4.9829e21 +4.9829e21 4.98286e21 +4.98286e21 0004.9829e21 +004.9829e21 004.98286e21 +04.98286e21 4.9829e21 +4.9829e21 4.98286e21 +4.98286e21 4.9829e21 +4.9829e21 4.98286e21 +4.98286e21 -2.09280132851277e+23 209.28e21 +209.28e21 209.28e21 +209.28e21 209.28013e21 +209.28013e21 000209.28e21 +00209.28e21 209.28013e21 +209.28013e21 209.28e21 +209.28e21 209.28013e21 +209.28013e21 209.28e21 +209.28e21 209.28013e21 +209.28013e21 -8.78976557975365e+24 8.78977e24 +8.78977e24 8.7898e24 +8.7898e24 8.78977e24 +8.78977e24 0008.7898e24 +008.7898e24 008.78977e24 +08.78977e24 8.7898e24 +8.7898e24 8.78977e24 +8.78977e24 8.7898e24 +8.7898e24 8.78977e24 +8.78977e24 -3.69170154349653e+26 369.17e24 +369.17e24 369.17e24 +369.17e24 369.17015e24 +369.17015e24 000369.17e24 +00369.17e24 369.17015e24 +369.17015e24 369.17e24 +369.17e24 369.17015e24 +369.17015e24 369.17e24 +369.17e24 369.17015e24 +369.17015e24 -1.55051464826854e+28 15.5051e27 +15.5051e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 00015.505e27 +0015.505e27 015.50515e27 +15.50515e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 -6.51216152272788e+29 651.216e27 +651.216e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 000651.22e27 +00651.22e27 651.21615e27 +651.21615e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 - -1e-27 1e-27 +1e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 00000001e-27 +0000001e-27 01.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 -1e-26 10e-27 +10e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 00000010e-27 +0000010e-27 10.00000e-27 +10.00000e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 10e-27 +10e-27 10.00000e-27 +10.00000e-27 -1e-25 100e-27 +100e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 00000100e-27 +0000100e-27 100.00000e-27 +100.00000e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 100e-27 +100e-27 100.00000e-27 +100.00000e-27 -1e-24 1y +1y 1y +1y 1.00000y +1.00000y 00000001y +0000001y 01.00000y +1.00000y 1y +1y 1.00000y +1.00000y 1y +1y 1.00000y +1.00000y -1e-23 10y +10y 10y +10y 10.00000y +10.00000y 00000010y +0000010y 10.00000y +10.00000y 10y +10y 10.00000y +10.00000y 10y +10y 10.00000y +10.00000y -1e-22 100y +100y 100y +100y 100.00000y +100.00000y 00000100y +0000100y 100.00000y +100.00000y 100y +100y 100.00000y +100.00000y 100y +100y 100.00000y +100.00000y -1e-21 1z +1z 1z +1z 1.00000z +1.00000z 00000001z +0000001z 01.00000z +1.00000z 1z +1z 1.00000z +1.00000z 1z +1z 1.00000z +1.00000z -1e-20 10z +10z 10z +10z 10.00000z +10.00000z 00000010z +0000010z 10.00000z +10.00000z 10z +10z 10.00000z +10.00000z 10z +10z 10.00000z +10.00000z -1e-19 100z +100z 100z +100z 100.00000z +100.00000z 00000100z +0000100z 100.00000z +100.00000z 100z +100z 100.00000z +100.00000z 100z +100z 100.00000z +100.00000z -1e-18 1a +1a 1a +1a 1.00000a +1.00000a 00000001a +0000001a 01.00000a +1.00000a 1a +1a 1.00000a +1.00000a 1a +1a 1.00000a +1.00000a -1e-17 10a +10a 10a +10a 10.00000a +10.00000a 00000010a +0000010a 10.00000a +10.00000a 10a +10a 10.00000a +10.00000a 10a +10a 10.00000a +10.00000a -1e-16 100a +100a 100a +100a 100.00000a +100.00000a 00000100a +0000100a 100.00000a +100.00000a 100a +100a 100.00000a +100.00000a 100a +100a 100.00000a +100.00000a -1e-15 1f +1f 1f +1f 1.00000f +1.00000f 00000001f +0000001f 01.00000f +1.00000f 1f +1f 1.00000f +1.00000f 1f +1f 1.00000f +1.00000f -1e-14 10f +10f 10f +10f 10.00000f +10.00000f 00000010f +0000010f 10.00000f +10.00000f 10f +10f 10.00000f +10.00000f 10f +10f 10.00000f +10.00000f -1e-13 100f +100f 100f +100f 100.00000f +100.00000f 00000100f +0000100f 100.00000f +100.00000f 100f +100f 100.00000f +100.00000f 100f +100f 100.00000f +100.00000f -1e-12 1p +1p 1p +1p 1.00000p +1.00000p 00000001p +0000001p 01.00000p +1.00000p 1p +1p 1.00000p +1.00000p 1p +1p 1.00000p +1.00000p -1e-11 10p +10p 10p +10p 10.00000p +10.00000p 00000010p +0000010p 10.00000p +10.00000p 10p +10p 10.00000p +10.00000p 10p +10p 10.00000p +10.00000p -1e-10 100p +100p 100p +100p 100.00000p +100.00000p 00000100p +0000100p 100.00000p +100.00000p 100p +100p 100.00000p +100.00000p 100p +100p 100.00000p +100.00000p -1e-09 1n +1n 1n +1n 1.00000n +1.00000n 000000001n +00000001n 001.00000n +01.00000n 1n +1n 1.00000n +1.00000n 1n +1n 1.00000n +1.00000n -1e-08 10n +10n 10n +10n 10.00000n +10.00000n 000000010n +00000010n 010.00000n +10.00000n 10n +10n 10.00000n +10.00000n 10n +10n 10.00000n +10.00000n -1e-07 100n +100n 100n +100n 100.00000n +100.00000n 000000100n +00000100n 100.00000n +100.00000n 100n +100n 100.00000n +100.00000n 100n +100n 100.00000n +100.00000n -1e-06 1u +1u 1u +1u 1.00000u +1.00000u 000000001u +00000001u 001.00000u +01.00000u 1u +1u 1.00000u +1.00000u 1u +1u 1.00000u +1.00000u -1e-05 10u +10u 10u +10u 10.00000u +10.00000u 000000010u +00000010u 010.00000u +10.00000u 10u +10u 10.00000u +10.00000u 10u +10u 10.00000u +10.00000u -0.0001 100u +100u 100u +100u 100.00000u +100.00000u 000000100u +00000100u 100.00000u +100.00000u 100u +100u 100.00000u +100.00000u 100u +100u 100.00000u +100.00000u -0.001 1m +1m 1m +1m 1.00000m +1.00000m 000000001m +00000001m 001.00000m +01.00000m 1m +1m 1.00000m +1.00000m 1m +1m 1.00000m +1.00000m -0.01 10m +10m 10m +10m 10.00000m +10.00000m 000000010m +00000010m 010.00000m +10.00000m 10m +10m 10.00000m +10.00000m 10m +10m 10.00000m +10.00000m -0.1 100m +100m 100m +100m 100.00000m +100.00000m 000000100m +00000100m 100.00000m +100.00000m 100m +100m 100.00000m +100.00000m 100m +100m 100.00000m +100.00000m -1. 1 +1 1 +1 1.00000 +1.00000 0000000001 +000000001 0001.00000 +001.00000 1 +1 1.00000 +1.00000 1 +1 1.00000 +1.00000 -10. 10 +10 10 +10 10.00000 +10.00000 0000000010 +000000010 0010.00000 +010.00000 10 +10 10.00000 +10.00000 10 +10 10.00000 +10.00000 -100. 100 +100 100 +100 100.00000 +100.00000 0000000100 +000000100 0100.00000 +100.00000 100 +100 100.00000 +100.00000 100 +100 100.00000 +100.00000 -1000. 1K +1K 1K +1K 1.00000K +1.00000K 0000000001K +000000001K 0001.00000K +001.00000K 1K +1K 1.00000K +1.00000K 1K +1K 1.00000K +1.00000K -10000. 10K +10K 10K +10K 10.00000K +10.00000K 0000000010K +000000010K 0010.00000K +010.00000K 10K +10K 10.00000K +10.00000K 10K +10K 10.00000K +10.00000K -100000. 100K +100K 100K +100K 100.00000K +100.00000K 0000000100K +000000100K 0100.00000K +100.00000K 100K +100K 100.00000K +100.00000K 100K +100K 100.00000K +100.00000K -1000000. 1M +1M 1M +1M 1.00000M +1.00000M 0000000001M +000000001M 0001.00000M +001.00000M 1M +1M 1.00000M +1.00000M 1M +1M 1.00000M +1.00000M -10000000. 10M +10M 10M +10M 10.00000M +10.00000M 0000000010M +000000010M 0010.00000M +010.00000M 10M +10M 10.00000M +10.00000M 10M +10M 10.00000M +10.00000M -100000000. 100M +100M 100M +100M 100.00000M +100.00000M 0000000100M +000000100M 0100.00000M +100.00000M 100M +100M 100.00000M +100.00000M 100M +100M 100.00000M +100.00000M -1000000000. 1G +1G 1G +1G 1.00000G +1.00000G 0000000001G +000000001G 0001.00000G +001.00000G 1G +1G 1.00000G +1.00000G 1G +1G 1.00000G +1.00000G -10000000000. 10G +10G 10G +10G 10.00000G +10.00000G 0000000010G +000000010G 0010.00000G +010.00000G 10G +10G 10.00000G +10.00000G 10G +10G 10.00000G +10.00000G -100000000000. 100G +100G 100G +100G 100.00000G +100.00000G 0000000100G +000000100G 0100.00000G +100.00000G 100G +100G 100.00000G +100.00000G 100G +100G 100.00000G +100.00000G -1000000000000. 1T +1T 1T +1T 1.00000T +1.00000T 000000001T +00000001T 001.00000T +01.00000T 1T +1T 1.00000T +1.00000T 1T +1T 1.00000T +1.00000T -10000000000000. 10T +10T 10T +10T 10.00000T +10.00000T 000000010T +00000010T 010.00000T +10.00000T 10T +10T 10.00000T +10.00000T 10T +10T 10.00000T +10.00000T -100000000000000. 100T +100T 100T +100T 100.00000T +100.00000T 000000100T +00000100T 100.00000T +100.00000T 100T +100T 100.00000T +100.00000T 100T +100T 100.00000T +100.00000T -1e+15 1P +1P 1P +1P 1.00000P +1.00000P 000000001P +00000001P 001.00000P +01.00000P 1P +1P 1.00000P +1.00000P 1P +1P 1.00000P +1.00000P -1e+16 10P +10P 10P +10P 10.00000P +10.00000P 000000010P +00000010P 010.00000P +10.00000P 10P +10P 10.00000P +10.00000P 10P +10P 10.00000P +10.00000P -1e+17 100P +100P 100P +100P 100.00000P +100.00000P 000000100P +00000100P 100.00000P +100.00000P 100P +100P 100.00000P +100.00000P 100P +100P 100.00000P +100.00000P -1e+18 1E +1E 1E +1E 1.00000E +1.00000E 000000001E +00000001E 001.00000E +01.00000E 1E +1E 1.00000E +1.00000E 1E +1E 1.00000E +1.00000E -1e+19 10E +10E 10E +10E 10.00000E +10.00000E 000000010E +00000010E 010.00000E +10.00000E 10E +10E 10.00000E +10.00000E 10E +10E 10.00000E +10.00000E -1e+20 100E +100E 100E +100E 100.00000E +100.00000E 000000100E +00000100E 100.00000E +100.00000E 100E +100E 100.00000E +100.00000E 100E +100E 100.00000E +100.00000E -1e+21 1Z +1Z 1Z +1Z 1.00000Z +1.00000Z 000000001Z +00000001Z 001.00000Z +01.00000Z 1Z +1Z 1.00000Z +1.00000Z 1Z +1Z 1.00000Z +1.00000Z -1e+22 10Z +10Z 10Z +10Z 10.00000Z +10.00000Z 000000010Z +00000010Z 010.00000Z +10.00000Z 10Z +10Z 10.00000Z +10.00000Z 10Z +10Z 10.00000Z +10.00000Z -1e+23 100Z +100Z 100Z +100Z 100.00000Z +100.00000Z 000000100Z +00000100Z 100.00000Z +100.00000Z 100Z +100Z 100.00000Z +100.00000Z 100Z +100Z 100.00000Z +100.00000Z -1e+24 1Y +1Y 1Y +1Y 1.00000Y +1.00000Y 000000001Y +00000001Y 001.00000Y +01.00000Y 1Y +1Y 1.00000Y +1.00000Y 1Y +1Y 1.00000Y +1.00000Y -1e+25 10Y +10Y 10Y +10Y 10.00000Y +10.00000Y 000000010Y +00000010Y 010.00000Y +10.00000Y 10Y +10Y 10.00000Y +10.00000Y 10Y +10Y 10.00000Y +10.00000Y -1e+26 100Y +100Y 100Y +100Y 100.00000Y +100.00000Y 000000100Y +00000100Y 100.00000Y +100.00000Y 100Y +100Y 100.00000Y +100.00000Y 100Y +100Y 100.00000Y +100.00000Y -1e+27 1e27 +1e27 1e27 +1e27 1.00000e27 +1.00000e27 000000001e27 +00000001e27 001.00000e27 +01.00000e27 1e27 +1e27 1.00000e27 +1.00000e27 1e27 +1e27 1.00000e27 +1.00000e27 -1e+28 10e27 +10e27 10e27 +10e27 10.00000e27 +10.00000e27 000000010e27 +00000010e27 010.00000e27 +10.00000e27 10e27 +10e27 10.00000e27 +10.00000e27 10e27 +10e27 10.00000e27 +10.00000e27 -1e+29 100e27 +100e27 100e27 +100e27 100.00000e27 +100.00000e27 000000100e27 +00000100e27 100.00000e27 +100.00000e27 100e27 +100e27 100.00000e27 +100.00000e27 100e27 +100e27 100.00000e27 +100.00000e27 - -1e-27 1e-27 +1e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 00000001e-27 +0000001e-27 01.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 1e-27 +1e-27 1.00000e-27 +1.00000e-27 -4.2e-26 42e-27 +42e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 00000042e-27 +0000042e-27 42.00000e-27 +42.00000e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 42e-27 +42e-27 42.00000e-27 +42.00000e-27 -1.764e-24 1.764y +1.764y 1.764y +1.764y 1.76400y +1.76400y 0001.764y +001.764y 01.76400y +1.76400y 1.764y +1.764y 1.76400y +1.76400y 1.764y +1.764y 1.76400y +1.76400y -7.4088e-23 74.088y +74.088y 74.088y +74.088y 74.08800y +74.08800y 0074.088y +074.088y 74.08800y +74.08800y 74.088y +74.088y 74.08800y +74.08800y 74.088y +74.088y 74.08800y +74.08800y -3.111696e-21 3.1117z +3.1117z 3.1117z +3.1117z 3.11170z +3.11170z 003.1117z +03.1117z 03.11170z +3.11170z 3.1117z +3.1117z 3.11170z +3.11170z 3.1117z +3.1117z 3.11170z +3.11170z -1.30691232e-19 130.691z +130.691z 130.69z +130.69z 130.69123z +130.69123z 00130.69z +0130.69z 130.69123z +130.69123z 130.69z +130.69z 130.69123z +130.69123z 130.69z +130.69z 130.69123z +130.69123z -5.489031744e-18 5.48903a +5.48903a 5.489a +5.489a 5.48903a +5.48903a 0005.489a +005.489a 05.48903a +5.48903a 5.489a +5.489a 5.48903a +5.48903a 5.489a +5.489a 5.48903a +5.48903a -2.30539333248e-16 230.539a +230.539a 230.54a +230.54a 230.53933a +230.53933a 00230.54a +0230.54a 230.53933a +230.53933a 230.54a +230.54a 230.53933a +230.53933a 230.54a +230.54a 230.53933a +230.53933a -9.682651996416e-15 9.68265f +9.68265f 9.6827f +9.6827f 9.68265f +9.68265f 009.6827f +09.6827f 09.68265f +9.68265f 9.6827f +9.6827f 9.68265f +9.68265f 9.6827f +9.6827f 9.68265f +9.68265f -4.06671383849472e-13 406.671f +406.671f 406.67f +406.67f 406.67138f +406.67138f 00406.67f +0406.67f 406.67138f +406.67138f 406.67f +406.67f 406.67138f +406.67138f 406.67f +406.67f 406.67138f +406.67138f -1.70801981216778e-11 17.0802p +17.0802p 17.08p +17.08p 17.08020p +17.08020p 00017.08p +0017.08p 17.08020p +17.08020p 17.08p +17.08p 17.08020p +17.08020p 17.08p +17.08p 17.08020p +17.08020p -7.17368321110469e-10 717.368p +717.368p 717.37p +717.37p 717.36832p +717.36832p 00717.37p +0717.37p 717.36832p +717.36832p 717.37p +717.37p 717.36832p +717.36832p 717.37p +717.37p 717.36832p +717.36832p -3.01294694866397e-08 30.1295n +30.1295n 30.129n +30.129n 30.12947n +30.12947n 00030.129n +0030.129n 030.12947n +30.12947n 30.129n +30.129n 30.12947n +30.12947n 30.129n +30.129n 30.12947n +30.12947n -1.26543771843887e-06 1.26544u +1.26544u 1.2654u +1.2654u 1.26544u +1.26544u 0001.2654u +001.2654u 001.26544u +01.26544u 1.2654u +1.2654u 1.26544u +1.26544u 1.2654u +1.2654u 1.26544u +1.26544u -5.31483841744324e-05 53.1484u +53.1484u 53.148u +53.148u 53.14838u +53.14838u 00053.148u +0053.148u 053.14838u +53.14838u 53.148u +53.148u 53.14838u +53.14838u 53.148u +53.148u 53.14838u +53.14838u -0.00223223213532616 2.23223m +2.23223m 2.2322m +2.2322m 2.23223m +2.23223m 0002.2322m +002.2322m 002.23223m +02.23223m 2.2322m +2.2322m 2.23223m +2.23223m 2.2322m +2.2322m 2.23223m +2.23223m -0.0937537496836987 93.7537m +93.7537m 93.754m +93.754m 93.75375m +93.75375m 00093.754m +0093.754m 093.75375m +93.75375m 93.754m +93.754m 93.75375m +93.75375m 93.754m +93.754m 93.75375m +93.75375m -3.93765748671535 3.93766 +3.93766 3.9377 +3.9377 3.93766 +3.93766 00003.9377 +0003.9377 0003.93766 +003.93766 3.9377 +3.9377 3.93766 +3.93766 3.9377 +3.9377 3.93766 +3.93766 -165.381614442045 165.382 +165.382 165.38 +165.38 165.38161 +165.38161 0000165.38 +000165.38 0165.38161 +165.38161 165.38 +165.38 165.38161 +165.38161 165.38 +165.38 165.38161 +165.38161 -6946.02780656587 6.94603K +6.94603K 6.946K +6.946K 6.94603K +6.94603K 000006.946K +00006.946K 0006.94603K +006.94603K 6.946K +6.946K 6.94603K +6.94603K 6.946K +6.946K 6.94603K +6.94603K -291733.167875767 291.733K +291.733K 291.73K +291.73K 291.73317K +291.73317K 0000291.73K +000291.73K 0291.73317K +291.73317K 291.73K +291.73K 291.73317K +291.73317K 291.73K +291.73K 291.73317K +291.73317K -12252793.0507822 12.2528M +12.2528M 12.253M +12.253M 12.25279M +12.25279M 000012.253M +00012.253M 0012.25279M +012.25279M 12.253M +12.253M 12.25279M +12.25279M 12.253M +12.253M 12.25279M +12.25279M -514617308.132852 514.617M +514.617M 514.62M +514.62M 514.61731M +514.61731M 0000514.62M +000514.62M 0514.61731M +514.61731M 514.62M +514.62M 514.61731M +514.61731M 514.62M +514.62M 514.61731M +514.61731M -21613926941.5798 21.6139G +21.6139G 21.614G +21.614G 21.61393G +21.61393G 000021.614G +00021.614G 0021.61393G +021.61393G 21.614G +21.614G 21.61393G +21.61393G 21.614G +21.614G 21.61393G +21.61393G -907784931546.352 907.785G +907.785G 907.78G +907.78G 907.78493G +907.78493G 0000907.78G +000907.78G 0907.78493G +907.78493G 907.78G +907.78G 907.78493G +907.78493G 907.78G +907.78G 907.78493G +907.78493G -38126967124946.8 38.127T +38.127T 38.127T +38.127T 38.12697T +38.12697T 00038.127T +0038.127T 038.12697T +38.12697T 38.127T +38.127T 38.12697T +38.12697T 38.127T +38.127T 38.12697T +38.12697T -1.60133261924776e+15 1.60133P +1.60133P 1.6013P +1.6013P 1.60133P +1.60133P 0001.6013P +001.6013P 001.60133P +01.60133P 1.6013P +1.6013P 1.60133P +1.60133P 1.6013P +1.6013P 1.60133P +1.60133P -6.72559700084061e+16 67.256P +67.256P 67.256P +67.256P 67.25597P +67.25597P 00067.256P +0067.256P 067.25597P +67.25597P 67.256P +67.256P 67.25597P +67.25597P 67.256P +67.256P 67.25597P +67.25597P -2.82475074035306e+18 2.82475E +2.82475E 2.8248E +2.8248E 2.82475E +2.82475E 0002.8248E +002.8248E 002.82475E +02.82475E 2.8248E +2.8248E 2.82475E +2.82475E 2.8248E +2.8248E 2.82475E +2.82475E -1.18639531094828e+20 118.64E +118.64E 118.64E +118.64E 118.63953E +118.63953E 000118.64E +00118.64E 118.63953E +118.63953E 118.64E +118.64E 118.63953E +118.63953E 118.64E +118.64E 118.63953E +118.63953E -4.98286030598279e+21 4.98286Z +4.98286Z 4.9829Z +4.9829Z 4.98286Z +4.98286Z 0004.9829Z +004.9829Z 004.98286Z +04.98286Z 4.9829Z +4.9829Z 4.98286Z +4.98286Z 4.9829Z +4.9829Z 4.98286Z +4.98286Z -2.09280132851277e+23 209.28Z +209.28Z 209.28Z +209.28Z 209.28013Z +209.28013Z 000209.28Z +00209.28Z 209.28013Z +209.28013Z 209.28Z +209.28Z 209.28013Z +209.28013Z 209.28Z +209.28Z 209.28013Z +209.28013Z -8.78976557975365e+24 8.78977Y +8.78977Y 8.7898Y +8.7898Y 8.78977Y +8.78977Y 0008.7898Y +008.7898Y 008.78977Y +08.78977Y 8.7898Y +8.7898Y 8.78977Y +8.78977Y 8.7898Y +8.7898Y 8.78977Y +8.78977Y -3.69170154349653e+26 369.17Y +369.17Y 369.17Y +369.17Y 369.17015Y +369.17015Y 000369.17Y +00369.17Y 369.17015Y +369.17015Y 369.17Y +369.17Y 369.17015Y +369.17015Y 369.17Y +369.17Y 369.17015Y +369.17015Y -1.55051464826854e+28 15.5051e27 +15.5051e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 00015.505e27 +0015.505e27 015.50515e27 +15.50515e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 15.505e27 +15.505e27 15.50515e27 +15.50515e27 -6.51216152272788e+29 651.216e27 +651.216e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 000651.22e27 +00651.22e27 651.21615e27 +651.21615e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 651.22e27 +651.22e27 651.21615e27 +651.21615e27 - --1e-27 -1e-27 -1e-27 -1e-27 -1e-27 -1.00000e-27 -1.00000e-27 -0000001e-27 -0000001e-27 -1.00000e-27 -1.00000e-27 -1e-27 -1e-27 -1.00000e-27 -1.00000e-27 -1e-27 -1e-27 -1.00000e-27 -1.00000e-27 --4.2e-26 -42e-27 -42e-27 -42e-27 -42e-27 -42.00000e-27 -42.00000e-27 -0000042e-27 -0000042e-27 -42.00000e-27 -42.00000e-27 -42e-27 -42e-27 -42.00000e-27 -42.00000e-27 -42e-27 -42e-27 -42.00000e-27 -42.00000e-27 --1.764e-24 -1.764e-24 -1.764e-24 -1.764e-24 -1.764e-24 -1.76400e-24 -1.76400e-24 -001.764e-24 -001.764e-24 -1.76400e-24 -1.76400e-24 -1.764e-24 -1.764e-24 -1.76400e-24 -1.76400e-24 -1.764e-24 -1.764e-24 -1.76400e-24 -1.76400e-24 --7.4088e-23 -74.088e-24 -74.088e-24 -74.088e-24 -74.088e-24 -74.08800e-24 -74.08800e-24 -074.088e-24 -074.088e-24 -74.08800e-24 -74.08800e-24 -74.088e-24 -74.088e-24 -74.08800e-24 -74.08800e-24 -74.088e-24 -74.088e-24 -74.08800e-24 -74.08800e-24 --3.111696e-21 -3.1117e-21 -3.1117e-21 -3.1117e-21 -3.1117e-21 -3.11170e-21 -3.11170e-21 -03.1117e-21 -03.1117e-21 -3.11170e-21 -3.11170e-21 -3.1117e-21 -3.1117e-21 -3.11170e-21 -3.11170e-21 -3.1117e-21 -3.1117e-21 -3.11170e-21 -3.11170e-21 --1.30691232e-19 -130.691e-21 -130.691e-21 -130.69e-21 -130.69e-21 -130.69123e-21 -130.69123e-21 -0130.69e-21 -0130.69e-21 -130.69123e-21 -130.69123e-21 -130.69e-21 -130.69e-21 -130.69123e-21 -130.69123e-21 -130.69e-21 -130.69e-21 -130.69123e-21 -130.69123e-21 --5.489031744e-18 -5.48903e-18 -5.48903e-18 -5.489e-18 -5.489e-18 -5.48903e-18 -5.48903e-18 -005.489e-18 -005.489e-18 -5.48903e-18 -5.48903e-18 -5.489e-18 -5.489e-18 -5.48903e-18 -5.48903e-18 -5.489e-18 -5.489e-18 -5.48903e-18 -5.48903e-18 --2.30539333248e-16 -230.539e-18 -230.539e-18 -230.54e-18 -230.54e-18 -230.53933e-18 -230.53933e-18 -0230.54e-18 -0230.54e-18 -230.53933e-18 -230.53933e-18 -230.54e-18 -230.54e-18 -230.53933e-18 -230.53933e-18 -230.54e-18 -230.54e-18 -230.53933e-18 -230.53933e-18 --9.682651996416e-15 -9.68265e-15 -9.68265e-15 -9.6827e-15 -9.6827e-15 -9.68265e-15 -9.68265e-15 -09.6827e-15 -09.6827e-15 -9.68265e-15 -9.68265e-15 -9.6827e-15 -9.6827e-15 -9.68265e-15 -9.68265e-15 -9.6827e-15 -9.6827e-15 -9.68265e-15 -9.68265e-15 --4.06671383849472e-13 -406.671e-15 -406.671e-15 -406.67e-15 -406.67e-15 -406.67138e-15 -406.67138e-15 -0406.67e-15 -0406.67e-15 -406.67138e-15 -406.67138e-15 -406.67e-15 -406.67e-15 -406.67138e-15 -406.67138e-15 -406.67e-15 -406.67e-15 -406.67138e-15 -406.67138e-15 --1.70801981216778e-11 -17.0802e-12 -17.0802e-12 -17.08e-12 -17.08e-12 -17.08020e-12 -17.08020e-12 -0017.08e-12 -0017.08e-12 -17.08020e-12 -17.08020e-12 -17.08e-12 -17.08e-12 -17.08020e-12 -17.08020e-12 -17.08e-12 -17.08e-12 -17.08020e-12 -17.08020e-12 --7.17368321110469e-10 -717.368e-12 -717.368e-12 -717.37e-12 -717.37e-12 -717.36832e-12 -717.36832e-12 -0717.37e-12 -0717.37e-12 -717.36832e-12 -717.36832e-12 -717.37e-12 -717.37e-12 -717.36832e-12 -717.36832e-12 -717.37e-12 -717.37e-12 -717.36832e-12 -717.36832e-12 --3.01294694866397e-08 -30.1295e-9 -30.1295e-9 -30.129e-9 -30.129e-9 -30.12947e-9 -30.12947e-9 -0030.129e-9 -0030.129e-9 -30.12947e-9 -30.12947e-9 -30.129e-9 -30.129e-9 -30.12947e-9 -30.12947e-9 -30.129e-9 -30.129e-9 -30.12947e-9 -30.12947e-9 --1.26543771843887e-06 -1.26544e-6 -1.26544e-6 -1.2654e-6 -1.2654e-6 -1.26544e-6 -1.26544e-6 -001.2654e-6 -001.2654e-6 -01.26544e-6 -01.26544e-6 -1.2654e-6 -1.2654e-6 -1.26544e-6 -1.26544e-6 -1.2654e-6 -1.2654e-6 -1.26544e-6 -1.26544e-6 --5.31483841744324e-05 -53.1484e-6 -53.1484e-6 -53.148e-6 -53.148e-6 -53.14838e-6 -53.14838e-6 -0053.148e-6 -0053.148e-6 -53.14838e-6 -53.14838e-6 -53.148e-6 -53.148e-6 -53.14838e-6 -53.14838e-6 -53.148e-6 -53.148e-6 -53.14838e-6 -53.14838e-6 --0.00223223213532616 -2.23223e-3 -2.23223e-3 -2.2322e-3 -2.2322e-3 -2.23223e-3 -2.23223e-3 -002.2322e-3 -002.2322e-3 -02.23223e-3 -02.23223e-3 -2.2322e-3 -2.2322e-3 -2.23223e-3 -2.23223e-3 -2.2322e-3 -2.2322e-3 -2.23223e-3 -2.23223e-3 --0.0937537496836987 -93.7537e-3 -93.7537e-3 -93.754e-3 -93.754e-3 -93.75375e-3 -93.75375e-3 -0093.754e-3 -0093.754e-3 -93.75375e-3 -93.75375e-3 -93.754e-3 -93.754e-3 -93.75375e-3 -93.75375e-3 -93.754e-3 -93.754e-3 -93.75375e-3 -93.75375e-3 --3.93765748671535 -3.93766e0 -3.93766e0 -3.9377e0 -3.9377e0 -3.93766e0 -3.93766e0 -0003.9377e0 -0003.9377e0 -003.93766e0 -003.93766e0 -3.9377e0 -3.9377e0 -3.93766e0 -3.93766e0 -3.9377e0 -3.9377e0 -3.93766e0 -3.93766e0 --165.381614442045 -165.382e0 -165.382e0 -165.38e0 -165.38e0 -165.38161e0 -165.38161e0 -000165.38e0 -000165.38e0 -165.38161e0 -165.38161e0 -165.38e0 -165.38e0 -165.38161e0 -165.38161e0 -165.38e0 -165.38e0 -165.38161e0 -165.38161e0 --6946.02780656587 -6.94603e3 -6.94603e3 -6.946e3 -6.946e3 -6.94603e3 -6.94603e3 -00006.946e3 -00006.946e3 -006.94603e3 -006.94603e3 -6.946e3 -6.946e3 -6.94603e3 -6.94603e3 -6.946e3 -6.946e3 -6.94603e3 -6.94603e3 --291733.167875767 -291.733e3 -291.733e3 -291.73e3 -291.73e3 -291.73317e3 -291.73317e3 -000291.73e3 -000291.73e3 -291.73317e3 -291.73317e3 -291.73e3 -291.73e3 -291.73317e3 -291.73317e3 -291.73e3 -291.73e3 -291.73317e3 -291.73317e3 --12252793.0507822 -12.2528e6 -12.2528e6 -12.253e6 -12.253e6 -12.25279e6 -12.25279e6 -00012.253e6 -00012.253e6 -012.25279e6 -012.25279e6 -12.253e6 -12.253e6 -12.25279e6 -12.25279e6 -12.253e6 -12.253e6 -12.25279e6 -12.25279e6 --514617308.132852 -514.617e6 -514.617e6 -514.62e6 -514.62e6 -514.61731e6 -514.61731e6 -000514.62e6 -000514.62e6 -514.61731e6 -514.61731e6 -514.62e6 -514.62e6 -514.61731e6 -514.61731e6 -514.62e6 -514.62e6 -514.61731e6 -514.61731e6 --21613926941.5798 -21.6139e9 -21.6139e9 -21.614e9 -21.614e9 -21.61393e9 -21.61393e9 -00021.614e9 -00021.614e9 -021.61393e9 -021.61393e9 -21.614e9 -21.614e9 -21.61393e9 -21.61393e9 -21.614e9 -21.614e9 -21.61393e9 -21.61393e9 --907784931546.352 -907.785e9 -907.785e9 -907.78e9 -907.78e9 -907.78493e9 -907.78493e9 -000907.78e9 -000907.78e9 -907.78493e9 -907.78493e9 -907.78e9 -907.78e9 -907.78493e9 -907.78493e9 -907.78e9 -907.78e9 -907.78493e9 -907.78493e9 --38126967124946.8 -38.127e12 -38.127e12 -38.127e12 -38.127e12 -38.12697e12 -38.12697e12 -0038.127e12 -0038.127e12 -38.12697e12 -38.12697e12 -38.127e12 -38.127e12 -38.12697e12 -38.12697e12 -38.127e12 -38.127e12 -38.12697e12 -38.12697e12 --1.60133261924776e+15 -1.60133e15 -1.60133e15 -1.6013e15 -1.6013e15 -1.60133e15 -1.60133e15 -001.6013e15 -001.6013e15 -01.60133e15 -01.60133e15 -1.6013e15 -1.6013e15 -1.60133e15 -1.60133e15 -1.6013e15 -1.6013e15 -1.60133e15 -1.60133e15 --6.72559700084061e+16 -67.256e15 -67.256e15 -67.256e15 -67.256e15 -67.25597e15 -67.25597e15 -0067.256e15 -0067.256e15 -67.25597e15 -67.25597e15 -67.256e15 -67.256e15 -67.25597e15 -67.25597e15 -67.256e15 -67.256e15 -67.25597e15 -67.25597e15 --2.82475074035306e+18 -2.82475e18 -2.82475e18 -2.8248e18 -2.8248e18 -2.82475e18 -2.82475e18 -002.8248e18 -002.8248e18 -02.82475e18 -02.82475e18 -2.8248e18 -2.8248e18 -2.82475e18 -2.82475e18 -2.8248e18 -2.8248e18 -2.82475e18 -2.82475e18 --1.18639531094828e+20 -118.64e18 -118.64e18 -118.64e18 -118.64e18 -118.63953e18 -118.63953e18 -00118.64e18 -00118.64e18 -118.63953e18 -118.63953e18 -118.64e18 -118.64e18 -118.63953e18 -118.63953e18 -118.64e18 -118.64e18 -118.63953e18 -118.63953e18 --4.98286030598279e+21 -4.98286e21 -4.98286e21 -4.9829e21 -4.9829e21 -4.98286e21 -4.98286e21 -004.9829e21 -004.9829e21 -04.98286e21 -04.98286e21 -4.9829e21 -4.9829e21 -4.98286e21 -4.98286e21 -4.9829e21 -4.9829e21 -4.98286e21 -4.98286e21 --2.09280132851277e+23 -209.28e21 -209.28e21 -209.28e21 -209.28e21 -209.28013e21 -209.28013e21 -00209.28e21 -00209.28e21 -209.28013e21 -209.28013e21 -209.28e21 -209.28e21 -209.28013e21 -209.28013e21 -209.28e21 -209.28e21 -209.28013e21 -209.28013e21 --8.78976557975365e+24 -8.78977e24 -8.78977e24 -8.7898e24 -8.7898e24 -8.78977e24 -8.78977e24 -008.7898e24 -008.7898e24 -08.78977e24 -08.78977e24 -8.7898e24 -8.7898e24 -8.78977e24 -8.78977e24 -8.7898e24 -8.7898e24 -8.78977e24 -8.78977e24 --3.69170154349653e+26 -369.17e24 -369.17e24 -369.17e24 -369.17e24 -369.17015e24 -369.17015e24 -00369.17e24 -00369.17e24 -369.17015e24 -369.17015e24 -369.17e24 -369.17e24 -369.17015e24 -369.17015e24 -369.17e24 -369.17e24 -369.17015e24 -369.17015e24 --1.55051464826854e+28 -15.5051e27 -15.5051e27 -15.505e27 -15.505e27 -15.50515e27 -15.50515e27 -0015.505e27 -0015.505e27 -15.50515e27 -15.50515e27 -15.505e27 -15.505e27 -15.50515e27 -15.50515e27 -15.505e27 -15.505e27 -15.50515e27 -15.50515e27 --6.51216152272788e+29 -651.216e27 -651.216e27 -651.22e27 -651.22e27 -651.21615e27 -651.21615e27 -00651.22e27 -00651.22e27 -651.21615e27 -651.21615e27 -651.22e27 -651.22e27 -651.21615e27 -651.21615e27 -651.22e27 -651.22e27 -651.21615e27 -651.21615e27 Index: tests/link-once/main.cfa =================================================================== --- tests/link-once/main.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/link-once/main.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,10 @@ +// Test our new cfa_linkonce attribute: + +__attribute__(( cfa_linkonce )) signed int example = -7; +__attribute__(( cfa_linkonce )) unsigned int example = 12; + +int main(int argc, char * argv[]) { + signed int si = example; + unsigned int ui = example; + printf("signed=%d unsigned=%d\n", si, ui); +} Index: tests/link-once/partner.cfa =================================================================== --- tests/link-once/partner.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/link-once/partner.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,4 @@ +// Side file for the link-once test. + +__attribute__(( cfa_linkonce )) signed int example = -7; +__attribute__(( cfa_linkonce )) unsigned int example = 12; Index: tests/list/.expect/dlist-insert-remove.txt =================================================================== --- tests/list/.expect/dlist-insert-remove.txt (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ tests/list/.expect/dlist-insert-remove.txt (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -1,217 +1,2 @@ -~~~~~~~~~~~~~~~~~ Headless List Tests - insert_after ~~~~~~~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 1-i: Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by YOURS before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by MINE after -3.14 -0.5 -- -3.14 -- -0.5 -- -0.5 -3.14 -- -==== fred by YOURS after -3.14 -- -3.14 -- -0.5 -- -0.5 -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 2-i. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by YOURS before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by MINE after -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by YOURS after -3.14 -0.5 -- -3.14 -- -0.5 -- -0.5 -3.14 -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 3-i. Modifying Maries -~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== mary before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== mary after -3.14 -0.5 -- -3.14 -- -0.5 -- -0.5 -3.14 -- - -~~~~~~~~~~~~~~~~ Headless List Tests - insert_before ~~~~~~~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 1-ii: Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by YOURS before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by MINE after -3.14 -0.5 -- -3.14 -- -0.5 -- -0.5 -3.14 -- -==== fred by YOURS after -3.14 -- -3.14 -- -0.5 -- -0.5 -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 2-ii. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by YOURS before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by MINE after -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== fred by YOURS after -3.14 -0.5 -- -3.14 -- -0.5 -- -0.5 -3.14 -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 3-ii. Modifying Maries -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== mary before -3.14 -- -3.14 -- -0.5 -- -0.5 -- -==== mary after -3.14 -0.5 -- -3.14 -- -0.5 -- -0.5 -3.14 -- ~~~~~~~~~~~~~~~~~ Headed List Tests - insert_first ~~~~~~~~~~~~~~~~~~ @@ -557,129 +342,129 @@ - -~~~~~~~~~~ Element removal tests on Headless List: mid ~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 10-i. Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -1.7 -- -==== fred by YOURS after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -2.7 -- -2.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 11-i. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS after -1.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -1.7 -- -==== fred by YOURS after -2.7 -- -2.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 12-i. Modifying Maries -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~ Element removal tests on Headed List: at first ~~~~~~~~~~ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 13-i. Modifying Freds on MINE +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +2.7 +3.7 +- +2.7 +- +3.7 +- +3.7 +2.7 +- +==== fred by YOURS after +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +1.7 +- +1.7 +- +- +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 14-i. Modifying Freds on YOURS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS after +2.7 +3.7 +- +2.7 +- +3.7 +- +3.7 +2.7 +- +==== fred by YOURS after +1.7 +- +1.7 +- +- +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 15-i. Modifying Maries +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ==== mary before 1.7 @@ -696,147 +481,147 @@ - ==== mary after -1.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -1.7 -- -==== mary after -2.7 -- -2.7 -- -- -- - -~~~~~~~~~~ Element removal tests on Headless List: at first ~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 10-ii. Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -2.7 -3.7 -- -2.7 -- -3.7 -- -3.7 -2.7 -- -==== fred by YOURS after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -- -1.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 11-ii. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS after -2.7 -3.7 -- -2.7 -- -3.7 -- -3.7 -2.7 -- -==== fred by YOURS after -1.7 -- -1.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 12-ii. Modifying Maries -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2.7 +3.7 +- +2.7 +- +3.7 +- +3.7 +2.7 +- +==== mary after +1.7 +- +1.7 +- +- +- + +~~~~~~~~~~ Element removal tests on Headed List: at last ~~~~~~~~~~ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 13-ii. Modifying Freds on MINE +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +1.7 +2.7 +- +1.7 +- +2.7 +- +2.7 +1.7 +- +==== fred by YOURS after +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +3.7 +- +3.7 +- +- +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 14-ii. Modifying Freds on YOURS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS after +1.7 +2.7 +- +1.7 +- +2.7 +- +2.7 +1.7 +- +==== fred by YOURS after +3.7 +- +3.7 +- +- +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 15-ii. Modifying Maries +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ==== mary before 1.7 @@ -853,303 +638,269 @@ - ==== mary after -2.7 -3.7 -- -2.7 -- -3.7 -- -3.7 -2.7 -- -==== mary after -1.7 -- -1.7 -- -- -- - -~~~~~~~~~~ Element removal tests on Headless List: at last ~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 10-iii. Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -- -1.7 -- -2.7 -- -2.7 -1.7 -- -==== fred by YOURS after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -3.7 -- -3.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 11-iii. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS after -1.7 -2.7 -- -1.7 -- -2.7 -- -2.7 -1.7 -- -==== fred by YOURS after -3.7 -- -3.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 12-iii. Modifying Maries -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +1.7 +2.7 +- +1.7 +- +2.7 +- +2.7 +1.7 +- +==== mary after +3.7 +- +3.7 +- +- +- + +~~~~~~~~~~ Element removal tests on Headed List: of sole ~~~~~~~~~~ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 13-iii. Modifying Freds on MINE +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +0.7 +- +0.7 +- +0.7 +- +0.7 +- +==== fred by YOURS before +0.7 +- +0.7 +- +0.7 +- +0.7 +- +==== fred by YOURS after +0.7 +- +0.7 +- +0.7 +- +0.7 +- +==== fred by MINE after +0.7 +- +0.7 +- +- +- +==== fred by MINE after +0.7 +- +0.7 +- +0.7 +- +0.7 +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 14-iii. Modifying Freds on YOURS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +0.7 +- +0.7 +- +0.7 +- +0.7 +- +==== fred by YOURS before +0.7 +- +0.7 +- +0.7 +- +0.7 +- +==== fred by YOURS after +0.7 +- +0.7 +- +0.7 +- +0.7 +- +==== fred by YOURS after +0.7 +- +0.7 +- +- +- +==== fred by YOURS after +0.7 +- +0.7 +- +0.7 +- +0.7 +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 15-iii. Modifying Maries +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ==== mary before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== mary after -1.7 -2.7 -- -1.7 -- -2.7 -- -2.7 -1.7 -- -==== mary after -3.7 -- -3.7 -- -- -- - -~~~~~~~~~~ Element removal tests on Headed List: at first ~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 13-i. Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -2.7 -3.7 -- -2.7 -- -3.7 -- -3.7 -2.7 -- -==== fred by YOURS after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -- -1.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 14-i. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS after -2.7 -3.7 -- -2.7 -- -3.7 -- -3.7 -2.7 -- -==== fred by YOURS after -1.7 -- -1.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 15-i. Modifying Maries +0.7 +- +0.7 +- +0.7 +- +0.7 +- +==== mary after +0.7 +- +0.7 +- +- +- +==== mary after +0.7 +- +0.7 +- +0.7 +- +0.7 +- + +~~~~~~~~~~ End removal tests on Headed List: First ~~~~~~~~~~ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 16-i. Modifying Freds on MINE +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +2.7 +3.7 +- +2.7 +- +3.7 +- +3.7 +2.7 +- +==== fred by YOURS after +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +1.7 +- +1.7 +- +- +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 16-ii. Modifying Freds on YOURS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS after +2.7 +3.7 +- +2.7 +- +3.7 +- +3.7 +2.7 +- +==== fred by YOURS after +1.7 +- +1.7 +- +- +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 16-iii. Modifying Maries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ==== mary before @@ -1185,128 +936,128 @@ - -~~~~~~~~~~ Element removal tests on Headed List: at last ~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 13-ii. Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -- -1.7 -- -2.7 -- -2.7 -1.7 -- -==== fred by YOURS after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -3.7 -- -3.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 14-ii. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS after -1.7 -2.7 -- -1.7 -- -2.7 -- -2.7 -1.7 -- -==== fred by YOURS after -3.7 -- -3.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 15-ii. Modifying Maries +~~~~~~~~~~ End removal tests on Headed List: Last ~~~~~~~~~~ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 17-i. Modifying Freds on MINE +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +1.7 +2.7 +- +1.7 +- +2.7 +- +2.7 +1.7 +- +==== fred by YOURS after +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +3.7 +- +3.7 +- +- +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 17-ii. Modifying Freds on YOURS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== fred by MINE before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS before +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by MINE after +1.7 +2.7 +3.7 +- +1.7 +- +3.7 +- +3.7 +2.7 +1.7 +- +==== fred by YOURS after +1.7 +2.7 +- +1.7 +- +2.7 +- +2.7 +1.7 +- +==== fred by YOURS after +3.7 +- +3.7 +- +- +- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 17-iii. Modifying Maries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ==== mary before @@ -1342,438 +1093,18 @@ - -~~~~~~~~~~ Element removal tests on Headed List: of sole ~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 13-iii. Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -0.7 -- -0.7 -- -0.7 -- -0.7 -- -==== fred by YOURS before -0.7 -- -0.7 -- -0.7 -- -0.7 -- -==== fred by YOURS after -0.7 -- -0.7 -- -0.7 -- -0.7 -- -==== fred by MINE after -0.7 -- -0.7 -- -- -- -==== fred by MINE after -0.7 -- -0.7 -- -0.7 -- -0.7 -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 14-iii. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -0.7 -- -0.7 -- -0.7 -- -0.7 -- -==== fred by YOURS before -0.7 -- -0.7 -- -0.7 -- -0.7 -- -==== fred by YOURS after -0.7 -- -0.7 -- -0.7 -- -0.7 -- -==== fred by YOURS after -0.7 -- -0.7 -- -- -- -==== fred by YOURS after -0.7 -- -0.7 -- -0.7 -- -0.7 -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 15-iii. Modifying Maries -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== mary before -0.7 -- -0.7 -- -0.7 -- -0.7 -- -==== mary after -0.7 -- -0.7 -- -- -- -==== mary after -0.7 -- -0.7 -- -0.7 -- -0.7 -- - -~~~~~~~~~~ End removal tests on Headed List: First ~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 16-i. Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -2.7 -3.7 -- -2.7 -- -3.7 -- -3.7 -2.7 -- -==== fred by YOURS after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -- -1.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 16-ii. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS after -2.7 -3.7 -- -2.7 -- -3.7 -- -3.7 -2.7 -- -==== fred by YOURS after -1.7 -- -1.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 16-iii. Modifying Maries -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== mary before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== mary after -2.7 -3.7 -- -2.7 -- -3.7 -- -3.7 -2.7 -- -==== mary after -1.7 -- -1.7 -- -- -- - -~~~~~~~~~~ End removal tests on Headed List: Last ~~~~~~~~~~ - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 17-i. Modifying Freds on MINE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -- -1.7 -- -2.7 -- -2.7 -1.7 -- -==== fred by YOURS after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -3.7 -- -3.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 17-ii. Modifying Freds on YOURS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== fred by MINE before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by MINE after -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== fred by YOURS after -1.7 -2.7 -- -1.7 -- -2.7 -- -2.7 -1.7 -- -==== fred by YOURS after -3.7 -- -3.7 -- -- -- -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Test 17-iii. Modifying Maries -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -==== mary before -1.7 -2.7 -3.7 -- -1.7 -- -3.7 -- -3.7 -2.7 -1.7 -- -==== mary after -1.7 -2.7 -- -1.7 -- -2.7 -- -2.7 -1.7 -- -==== mary after -3.7 -- -3.7 -- -- -- +~~~~~~~~~~~~~~~~~~~ Ease-of-access cases ~~~~~~~~~~~~~~~~~~ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 18-i. Modifying Freds on MINE +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Not implmented +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 18-ii. Modifying Freds on YOURS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Not implmented +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Test 18-iii. Modifying Maries +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +accessor_cases done +try_pop cases done +origin_mutation cases done Index: tests/list/dlist-insert-remove.cfa =================================================================== --- tests/list/dlist-insert-remove.cfa (revision 299b8b28943fdcfddf8ffb4647eef91e58841627) +++ tests/list/dlist-insert-remove.cfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -19,10 +19,12 @@ struct fred { float adatum; - DLISTED_MGD_EXPL_IN(fred, mine) - DLISTED_MGD_EXPL_IN(fred, yours) + inline struct mine { inline dlink(fred); }; + inline struct yours { inline dlink(fred); }; }; - -DLISTED_MGD_EXPL_OUT(fred, mine) -DLISTED_MGD_EXPL_OUT(fred, yours) +P9_EMBEDDED(fred, fred.mine) +P9_EMBEDDED(fred, fred.yours) +P9_EMBEDDED(fred.mine, dlink(fred)) +P9_EMBEDDED(fred.yours, dlink(fred)) + void ?{}(fred &this, float adatum) { @@ -33,8 +35,8 @@ struct mary { float anotherdatum; - DLISTED_MGD_IMPL_IN(mary) + inline dlink(mary); }; -DLISTED_MGD_IMPL_OUT(mary) +P9_EMBEDDED(mary, dlink(mary)) void ?{}(mary &this, float anotherdatum) { @@ -53,17 +55,18 @@ //////////////////////////////////////////////////////////// -void printMyFredsFwd(fred &f) { - while (&f != 0p) { +void printMyFredsFwd(fred & f) { + with( DLINK_VIA( fred, fred.mine ) ) + do { sout | f.adatum; - &f = &f`in_mine`next; - } -} - -void printMyFredsRev(fred &f) { - while (&f != 0p) { + } while (f`moveNext); +} + +void printMyFredsRev(fred & f) { + with( DLINK_VIA( fred, fred.mine ) ) + do { sout | f.adatum; - &f = &f`in_mine`prev; - } -} + } while (f`movePrev); +} + void printMyFreddies(fred &f1, fred &f2, int isBefore) { @@ -73,22 +76,30 @@ sout | "==== fred by MINE after "; } - printMyFredsFwd(f1); sout | '-'; - printMyFredsRev(f1); sout | '-'; - printMyFredsFwd(f2); sout | '-'; - printMyFredsRev(f2); sout | '-'; -} - -void printYourFredsFwd(fred &f) { - while (&f != 0p) { + if (&f1) { + printMyFredsFwd(f1); sout | '-'; + printMyFredsRev(f1); sout | '-'; + } else { + sout | '-'; sout | '-'; + } + if (&f2) { + printMyFredsFwd(f2); sout | '-'; + printMyFredsRev(f2); sout | '-'; + } else { + sout | '-'; sout | '-'; + } +} + +void printYourFredsFwd(fred & f) { + with( DLINK_VIA( fred, fred.yours ) ) + do { sout | f.adatum; - &f = &f`in_yours`next; - } -} - -void printYourFredsRev(fred &f) { - while (&f != 0p) { + } while (f`moveNext); +} + +void printYourFredsRev(fred & f) { + with( DLINK_VIA( fred, fred.yours ) ) + do { sout | f.adatum; - &f = &f`in_yours`prev; - } + } while (f`movePrev); } @@ -99,22 +110,28 @@ sout | "==== fred by YOURS after "; } - printYourFredsFwd(f1); sout | '-'; - printYourFredsRev(f1); sout | '-'; - printYourFredsFwd(f2); sout | '-'; - printYourFredsRev(f2); sout | '-'; + if (&f1) { + printYourFredsFwd(f1); sout | '-'; + printYourFredsRev(f1); sout | '-'; + } else { + sout | '-'; sout | '-'; + } + if (&f2) { + printYourFredsFwd(f2); sout | '-'; + printYourFredsRev(f2); sout | '-'; + } else { + sout | '-'; sout | '-'; + } } void printMariesFwd(mary &m) { - while (&m != 0p) { + do { sout | m.anotherdatum; - &m = &m`next; - } + } while (m`moveNext); } void printMariesRev(mary &m) { - while (&m != 0p) { + do { sout | m.anotherdatum; - &m = &m`prev; - } + } while (m`movePrev); } @@ -125,8 +142,16 @@ sout | "==== mary after "; } - printMariesFwd(m1); sout | '-'; - printMariesRev(m1); sout | '-'; - printMariesFwd(m2); sout | '-'; - printMariesRev(m2); sout | '-'; + if (&m1) { + printMariesFwd(m1); sout | '-'; + printMariesRev(m1); sout | '-'; + } else { + sout | '-'; sout | '-'; + } + if (&m2) { + printMariesFwd(m2); sout | '-'; + printMariesRev(m2); sout | '-'; + } else { + sout | '-'; sout | '-'; + } } @@ -153,5 +178,5 @@ // - from list position #2 moving backward (d) // The expected-output comments are in form a;b;c;d where a::=num,num,num - +#if 0 void test__insertafter_singleton_on_singleton__fred_mine () { fred f1 = {3.14}; @@ -161,5 +186,6 @@ printYourFreddies(f1, f2, 1); // 3.14; 3.14; 0.5; 0.5 - insert_after(f1`in_mine, f2); + diref(fred, fred.mine) f1_mine = f1`from; + insert_after(f1_mine, f2); printMyFreddies(f1, f2, 0); // 3.14, 0.5; 3.14; 0.5; 0.5, 3.14 (modified) @@ -174,5 +200,6 @@ printYourFreddies(f1, f2, 1); // 3.14; 3.14; 0.5; 0.5 - insert_after(f1`in_yours, f2); + diref(fred, fred.yours) f1_yours = f1`from; + insert_after(f1_yours, f2); printMyFreddies(f1, f2, 0); // 3.14; 3.14; 0.5; 0.5 (unmodified) @@ -208,5 +235,6 @@ printYourFreddies(f1, f2, 1); // 3.14; 3.14; 0.5; 0.5 - insert_before(f2`in_mine, f1); + diref(fred, fred.mine) f2_mine = f2`from; + insert_before(f2_mine, f1); printMyFreddies(f1, f2, 0); // 3.14, 0.5; 3.14; 0.5; 0.5, 3.14 (modified) @@ -221,5 +249,6 @@ printYourFreddies(f1, f2, 1); // 3.14; 3.14; 0.5; 0.5 - insert_before(f2`in_yours, f1); + diref(fred, fred.yours) f2_yours = f2`from; + insert_before(f2_yours, f1); printMyFreddies(f1, f2, 0); // 3.14; 3.14; 0.5; 0.5 (unmodified) @@ -237,5 +266,5 @@ printMariatheotokos(m1, m2, 0); // 3.14, 0.5; 3.14; 0.5; 0.5, 3.14 (modified) } - +#endif //////////////////////////////////////////////////////////// // @@ -250,5 +279,4 @@ // All three tests exercise the case of creating an empty container and // adding two items to it. - void test__insertfirst_two_on_empty__fred_mine() { @@ -256,5 +284,5 @@ fred f2 = {0.5}; - dlist(fred_in_mine, fred) lf; + dlist(fred, fred.mine) lf; verify(validate(lf)); @@ -277,5 +305,5 @@ fred f2 = {0.5}; - dlist(fred_in_yours, fred) lf; + dlist(fred, fred.yours) lf; verify(validate(lf)); @@ -292,5 +320,4 @@ printYourFreddies(f1, f2, 0); // 3.14, 0.5; 3.14; 0.5; 0.5, 3.14 (modified) } - void test__insertfirst_two_on_empty__mary() { @@ -298,5 +325,5 @@ mary m2 = {0.5}; - dlist(mary, mary) lm; + dlist(mary) lm; verify(validate(lm)); @@ -325,5 +352,5 @@ fred f2 = {0.5}; - dlist(fred_in_mine, fred) lf; + dlist(fred, fred.mine) lf; verify(validate(lf)); @@ -346,5 +373,5 @@ fred f2 = {0.5}; - dlist(fred_in_yours, fred) lf; + dlist(fred, fred.yours) lf; verify(validate(lf)); @@ -367,5 +394,5 @@ mary m2 = {0.5}; - dlist(mary, mary) lm; + dlist(mary) lm; verify(validate(lm)); @@ -394,17 +421,17 @@ fred f2 = {0.5}; - dlist(fred_in_mine, fred) lf; - - assert(& lf`first == 0p); - assert(& lf`last == 0p); + dlist(fred, fred.mine) lf; + + assert( & lf`first == 0p ); + assert( & lf`last == 0p ); insert_first(lf, f1); - assert(& lf`first == & f1); - assert(& lf`last == & f1); + assert( & lf`first == & f1 ); + assert( & lf`last == & f1 ); verify(validate(lf)); - insert_after(f1`in_mine, f2); + with ( DLINK_VIA(fred, fred.mine) ) insert_after(f1, f2); verify(validate(lf)); @@ -413,6 +440,6 @@ printYourFreddies(f1, f2, 0); // 3.14; 3.14; 0.5; 0.5 (unmodified) - assert(& lf`first == & f1); - assert(& lf`last == & f2); + assert( & lf`first == & f1 ); + assert( & lf`last == & f2 ); } @@ -422,17 +449,17 @@ fred f2 = {0.5}; - dlist(fred_in_yours, fred) lf; - - assert(& lf`first == 0p); - assert(& lf`last == 0p); + dlist(fred, fred.yours) lf; + + assert( & lf`first == 0p ); + assert( & lf`last == 0p ); insert_first(lf, f1); - assert(& lf`first == & f1); - assert(& lf`last == & f1); + assert( & lf`first == & f1 ); + assert( & lf`last == & f1 ); verify(validate(lf)); - insert_after(f1`in_yours, f2); + with ( DLINK_VIA(fred, fred.yours) ) insert_after(f1, f2); verify(validate(lf)); @@ -441,6 +468,6 @@ printYourFreddies(f1, f2, 0); // 3.14, 0.5; 3.14; 0.5; 0.5, 3.14 (modified) - assert(& lf`first == & f1); - assert(& lf`last == & f2); + assert( & lf`first == & f1 ); + assert( & lf`last == & f2 ); } @@ -450,13 +477,13 @@ mary m2 = {0.5}; - dlist(mary, mary) lm; - - assert(& lm`first == 0p); - assert(& lm`last == 0p); + dlist(mary) lm; + + assert( & lm`first == 0p ); + assert( & lm`last == 0p ); insert_first(lm, m1); - assert(& lm`first == & m1); - assert(& lm`last == & m1); + assert( & lm`first == & m1 ); + assert( & lm`last == & m1 ); verify(validate(lm)); @@ -468,6 +495,6 @@ printMariatheotokos(m1, m2, 0); // 3.14, 0.5; 3.14; 0.5; 0.5, 3.14 (modified) - assert(& lm`first == & m1); - assert(& lm`last == & m2); + assert( & lm`first == & m1 ); + assert( & lm`last == & m2 ); } @@ -487,17 +514,17 @@ fred f2 = {0.5}; - dlist(fred_in_mine, fred) lf; - - assert(& lf`first == 0p); - assert(& lf`last == 0p); + dlist(fred, fred.mine) lf; + + assert( & lf`first == 0p ); + assert( & lf`last == 0p ); insert_last(lf, f2); - assert(& lf`first == & f2); - assert(& lf`last == & f2); + assert( & lf`first == & f2 ); + assert( & lf`last == & f2 ); verify(validate(lf)); - insert_before(f2`in_mine, f1); + with ( DLINK_VIA(fred, fred.mine) ) insert_before(f2, f1); verify(validate(lf)); @@ -506,6 +533,6 @@ printYourFreddies(f1, f2, 0); // 3.14; 3.14; 0.5; 0.5 (unmodified) - assert(& lf`first == & f1); - assert(& lf`last == & f2); + assert( & lf`first == & f1 ); + assert( & lf`last == & f2 ); } @@ -515,17 +542,17 @@ fred f2 = {0.5}; - dlist(fred_in_yours, fred) lf; - - assert(& lf`first == 0p); - assert(& lf`last == 0p); + dlist(fred, fred.yours) lf; + + assert( & lf`first == 0p ); + assert( & lf`last == 0p ); insert_last(lf, f2); - assert(& lf`first == & f2); - assert(& lf`last == & f2); + assert( & lf`first == & f2 ); + assert( & lf`last == & f2 ); verify(validate(lf)); - insert_before(f2`in_yours, f1); + with ( DLINK_VIA(fred, fred.yours) )insert_before(f2, f1); verify(validate(lf)); @@ -534,6 +561,6 @@ printYourFreddies(f1, f2, 0); // 3.14, 0.5; 3.14; 0.5; 0.5, 3.14 (modified) - assert(& lf`first == & f1); - assert(& lf`last == & f2); + assert( & lf`first == & f1 ); + assert( & lf`last == & f2 ); } @@ -543,13 +570,13 @@ mary m2 = {0.5}; - dlist(mary, mary) lm; - - assert(& lm`first == 0p); - assert(& lm`last == 0p); + dlist(mary) lm; + + assert( & lm`first == 0p ); + assert( & lm`last == 0p ); insert_last(lm, m2); - assert(& lm`first == & m2); - assert(& lm`last == & m2); + assert( & lm`first == & m2 ); + assert( & lm`last == & m2 ); verify(validate(lm)); @@ -561,7 +588,8 @@ printMariatheotokos(m1, m2, 0); // 3.14, 0.5; 3.14; 0.5; 0.5, 3.14 (modified) - assert(& lm`first == & m1); - assert(& lm`last == & m2); -} + assert( & lm`first == & m1 ); + assert( & lm`last == & m2 ); +} +#if 0 //////////////////////////////////////////////////////////// @@ -846,5 +874,5 @@ // //////////////////////////////////////////////////////////// - +#endif void test__remove_at_head__fred_mine() { @@ -853,10 +881,10 @@ fred f3 = {3.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f1); insert_last(flm, f2); insert_last(flm, f3); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f1); insert_last(fly, f2); @@ -869,5 +897,5 @@ verify(validate(flm)); - remove(f1`in_mine); + with( DLINK_VIA(fred, fred.mine) ) remove(f1); verify(validate(fly)); @@ -881,7 +909,8 @@ // TODO: decide on appropriate ovservable outcome (is_listed?) and its itended semantics - assert(f1.$links_mine.next.is_terminator == false); - assert(f1.$links_mine.prev.is_terminator == false); -} + // assert(f1.$links_mine.next.is_terminator == false); + // assert(f1.$links_mine.prev.is_terminator == false); +} + void test__remove_at_head__fred_yours() { @@ -891,10 +920,10 @@ fred f3 = {3.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f1); insert_last(flm, f2); insert_last(flm, f3); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f1); insert_last(fly, f2); @@ -907,5 +936,5 @@ verify(validate(flm)); - remove(f1`in_yours); + with( DLINK_VIA(fred, fred.yours) ) remove(f1); verify(validate(fly)); @@ -919,6 +948,6 @@ // TODO: decide on appropriate ovservable outcome (is_listed?) and its itended semantics - assert(f1.$links_yours.next.is_terminator == false); - assert(f1.$links_yours.prev.is_terminator == false); + // assert(f1.$links_yours.next.is_terminator == false); + // assert(f1.$links_yours.prev.is_terminator == false); } @@ -929,5 +958,5 @@ mary m3 = {3.7}; - dlist(mary, mary) ml; + dlist(mary) ml; insert_last(ml, m1); insert_last(ml, m2); @@ -948,6 +977,6 @@ // TODO: decide on appropriate ovservable outcome (is_listed?) and its itended semantics - assert(m1.$links.next.is_terminator == false); - assert(m1.$links.prev.is_terminator == false); + // assert(m1.$links.next.is_terminator == false); + // assert(m1.$links.prev.is_terminator == false); } @@ -968,10 +997,10 @@ fred f3 = {3.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f1); insert_last(flm, f2); insert_last(flm, f3); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f1); insert_last(fly, f2); @@ -984,5 +1013,5 @@ verify(validate(flm)); - remove(f3`in_mine); + with( DLINK_VIA(fred, fred.mine) ) remove(f3); verify(validate(fly)); @@ -996,6 +1025,6 @@ // TODO: decide on appropriate ovservable outcome (is_listed?) and its itended semantics - assert(f3.$links_mine.next.is_terminator == false); - assert(f3.$links_mine.prev.is_terminator == false); + // assert(f3.$links_mine.next.is_terminator == false); + // assert(f3.$links_mine.prev.is_terminator == false); } @@ -1006,10 +1035,10 @@ fred f3 = {3.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f1); insert_last(flm, f2); insert_last(flm, f3); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f1); insert_last(fly, f2); @@ -1022,5 +1051,5 @@ verify(validate(flm)); - remove(f3`in_yours); + with( DLINK_VIA(fred, fred.yours) ) remove(f3); verify(validate(fly)); @@ -1034,6 +1063,6 @@ // TODO: decide on appropriate ovservable outcome (is_listed?) and its itended semantics - assert(f3.$links_yours.next.is_terminator == false); - assert(f3.$links_yours.prev.is_terminator == false); + // assert(f3.$links_yours.next.is_terminator == false); + // assert(f3.$links_yours.prev.is_terminator == false); } @@ -1044,5 +1073,5 @@ mary m3 = {3.7}; - dlist(mary, mary) ml; + dlist(mary) ml; insert_last(ml, m1); insert_last(ml, m2); @@ -1063,6 +1092,6 @@ // TODO: decide on appropriate ovservable outcome (is_listed?) and its itended semantics - assert(m3.$links.next.is_terminator == false); - assert(m3.$links.prev.is_terminator == false); + // assert(m3.$links.next.is_terminator == false); + // assert(m3.$links.prev.is_terminator == false); } @@ -1081,8 +1110,8 @@ fred f = {0.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f); @@ -1093,11 +1122,11 @@ verify(validate(flm)); - remove(f`in_mine); - - verify(validate(fly)); - verify(validate(flm)); - - assert(& flm`first == 0p); - assert(& flm`last == 0p); + with( DLINK_VIA(fred, fred.mine) ) remove(f); + + verify(validate(fly)); + verify(validate(flm)); + + assert( & flm`first == 0p ); + assert( & flm`last == 0p ); printYourFreddies(fly`first, fly`last, 0); // 0.7; 0.7; 0.7; 0.7 (unmodified) @@ -1107,6 +1136,6 @@ // TODO: decide on appropriate ovservable outcome (is_listed?) and its itended semantics - assert(f.$links_mine.next.is_terminator == false); - assert(f.$links_mine.prev.is_terminator == false); + // assert(f.$links_mine.next.is_terminator == false); + // assert(f.$links_mine.prev.is_terminator == false); insert_last(flm, f); @@ -1120,8 +1149,8 @@ fred f = {0.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f); @@ -1132,11 +1161,11 @@ verify(validate(flm)); - remove(f`in_yours); - - verify(validate(fly)); - verify(validate(flm)); - - assert(& fly`first == 0p); - assert(& fly`last == 0p); + with( DLINK_VIA(fred, fred.yours) ) remove(f); + + verify(validate(fly)); + verify(validate(flm)); + + assert( & fly`first == 0p ); + assert( & fly`last == 0p ); printYourFreddies(flm`first, flm`last, 0); // 0.7; 0.7; 0.7; 0.7 (unmodified) @@ -1146,6 +1175,6 @@ // TODO: decide on appropriate ovservable outcome (is_listed?) and its itended semantics - assert(f.$links_yours.next.is_terminator == false); - assert(f.$links_yours.prev.is_terminator == false); + // assert(f.$links_yours.next.is_terminator == false); + // assert(f.$links_yours.prev.is_terminator == false); insert_last(fly, f); @@ -1159,5 +1188,5 @@ mary m = {0.7}; - dlist(mary, mary) ml; + dlist(mary) ml; insert_last(ml, m); @@ -1170,6 +1199,6 @@ verify(validate(ml)); - assert(& ml`first == 0p); - assert(& ml`last == 0p); + assert( & ml`first == 0p ); + assert( & ml`last == 0p ); // observe f is solo in mine (now unlisted); in yours, it was just traversed @@ -1177,6 +1206,6 @@ // TODO: decide on appropriate ovservable outcome (is_listed?) and its itended semantics - assert(m.$links.next.is_terminator == false); - assert(m.$links.prev.is_terminator == false); + // assert(m.$links.next.is_terminator == false); + // assert(m.$links.prev.is_terminator == false); insert_last(ml, m); @@ -1203,10 +1232,10 @@ fred f3 = {3.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f1); insert_last(flm, f2); insert_last(flm, f3); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f1); insert_last(fly, f2); @@ -1219,5 +1248,5 @@ verify(validate(flm)); - fred & popped = pop_first(flm); + fred & popped = try_pop_front(flm); verify(validate(fly)); @@ -1239,10 +1268,10 @@ fred f3 = {3.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f1); insert_last(flm, f2); insert_last(flm, f3); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f1); insert_last(fly, f2); @@ -1255,5 +1284,5 @@ verify(validate(flm)); - fred & popped = pop_first(fly); + fred & popped = try_pop_front(fly); verify(validate(fly)); @@ -1275,5 +1304,5 @@ mary m3 = {3.7}; - dlist(mary, mary) ml; + dlist(mary) ml; insert_last(ml, m1); insert_last(ml, m2); @@ -1284,5 +1313,5 @@ verify(validate(ml)); - mary & popped = pop_first(ml); + mary & popped = try_pop_front(ml); verify(validate(ml)); @@ -1302,10 +1331,10 @@ fred f3 = {3.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f1); insert_last(flm, f2); insert_last(flm, f3); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f1); insert_last(fly, f2); @@ -1318,5 +1347,5 @@ verify(validate(flm)); - fred & popped = pop_last(flm); + fred & popped = try_pop_back(flm); verify(validate(fly)); @@ -1338,10 +1367,10 @@ fred f3 = {3.7}; - dlist(fred_in_mine, fred) flm; + dlist(fred, fred.mine) flm; insert_last(flm, f1); insert_last(flm, f2); insert_last(flm, f3); - dlist(fred_in_yours, fred) fly; + dlist(fred, fred.yours) fly; insert_last(fly, f1); insert_last(fly, f2); @@ -1354,5 +1383,5 @@ verify(validate(flm)); - fred & popped = pop_last(fly); + fred & popped = try_pop_back(fly); verify(validate(fly)); @@ -1374,5 +1403,5 @@ mary m3 = {3.7}; - dlist(mary, mary) ml; + dlist(mary) ml; insert_last(ml, m1); insert_last(ml, m2); @@ -1383,5 +1412,5 @@ verify(validate(ml)); - mary & popped = pop_last(ml); + mary & popped = try_pop_back(ml); verify(validate(ml)); @@ -1397,4 +1426,187 @@ //////////////////////////////////////////////////////////// // +// Section 4g +// +// Test cases of `isEmpty, `hasPrev, `hasNext, +// try_pop_front, try_pop_back, modifications via `elems +// +// Example of call-side user code +// +//////////////////////////////////////////////////////////// + +void test__accessor_cases__mary() { + + mary m1 = {1.7}; + mary m2 = {2.7}; + mary m3 = {3.7}; + + dlist(mary) ml; assert( ml`isEmpty); + + insert_last(ml, m1); assert(!ml`isEmpty); + insert_last(ml, m2); assert(!ml`isEmpty); + insert_last(ml, m3); assert(!ml`isEmpty); + + mary & m1prev = m1`prev; + mary & m1next = m1`next; + mary & m2prev = m2`prev; + mary & m2next = m2`next; + mary & m3prev = m3`prev; + mary & m3next = m3`next; + + assert (&m1prev == 0p); + assert (&m1next == &m2); + assert (&m2prev == &m1); + assert (&m2next == &m3); + assert (&m3prev == &m2); + assert (&m3next == 0p); + + assert(!m1`hasPrev); + assert( m1`hasNext); + assert( m2`hasPrev); + assert( m2`hasNext); + assert( m3`hasPrev); + assert(!m3`hasNext); + + printf("accessor_cases done\n"); +} + +void test__try_pop__mary() { + + mary m1 = {1.7}; + mary m2 = {2.7}; + mary m3 = {3.7}; + + dlist(mary) ml; + + mary &m1r = *0p; + mary &m2r = *0p; + mary &m3r = *0p; + mary &mxr = *0p; + + // queue, back to front + + assert( ml`isEmpty); + + insert_last(ml, m1); + insert_last(ml, m2); + insert_last(ml, m3); + + &m1r = & try_pop_front(ml); assert(!ml`isEmpty); + &m2r = & try_pop_front(ml); assert(!ml`isEmpty); + &m3r = & try_pop_front(ml); assert( ml`isEmpty); + &mxr = & try_pop_front(ml); assert( ml`isEmpty); + + assert( &m1r == &m1 ); + assert( &m2r == &m2 ); + assert( &m3r == &m3 ); + assert( &mxr == 0p ); + + &m1r = 0p; + &m2r = 0p; + &m3r = 0p; + + // queue, front to back + + assert( ml`isEmpty); + + insert_first(ml, m1); + insert_first(ml, m2); + insert_first(ml, m3); + + &m1r = & try_pop_back(ml); assert(!ml`isEmpty); + &m2r = & try_pop_back(ml); assert(!ml`isEmpty); + &m3r = & try_pop_back(ml); assert( ml`isEmpty); + &mxr = & try_pop_back(ml); assert( ml`isEmpty); + + assert( &m1r == &m1 ); + assert( &m2r == &m2 ); + assert( &m3r == &m3 ); + assert( &mxr == 0p ); + + &m1r = 0p; + &m2r = 0p; + &m3r = 0p; + + // stack at front + + assert( ml`isEmpty); + + insert_first(ml, m1); + insert_first(ml, m2); + insert_first(ml, m3); + + &m3r = & try_pop_front(ml); assert(!ml`isEmpty); + &m2r = & try_pop_front(ml); assert(!ml`isEmpty); + &m1r = & try_pop_front(ml); assert( ml`isEmpty); + &mxr = & try_pop_front(ml); assert( ml`isEmpty); + + assert( &m1r == &m1 ); + assert( &m2r == &m2 ); + assert( &m3r == &m3 ); + assert( &mxr == 0p ); + + &m1r = 0p; + &m2r = 0p; + &m3r = 0p; + + // stack at back + + assert( ml`isEmpty); + + insert_last(ml, m1); + insert_last(ml, m2); + insert_last(ml, m3); + + &m3r = & try_pop_back(ml); assert(!ml`isEmpty); + &m2r = & try_pop_back(ml); assert(!ml`isEmpty); + &m1r = & try_pop_back(ml); assert( ml`isEmpty); + &mxr = & try_pop_back(ml); assert( ml`isEmpty); + + assert( &m1r == &m1 ); + assert( &m2r == &m2 ); + assert( &m3r == &m3 ); + assert( &mxr == 0p ); + + &m1r = 0p; + &m2r = 0p; + &m3r = 0p; + + printf("try_pop cases done\n"); +} + +void test__origin_mutation__mary() { + + mary m1 = {1.7}; + + dlist(mary) ml; + mary & mlorigin = ml`elems; + + // insert before the origin + + insert_before( ml`elems, m1 ); + assert( ! ml`isEmpty ); + + mary & mlfirst = ml`first; + mary & mllast = ml`last; + + assert( &m1 == & mlfirst ); + assert( &m1 == & mllast ); + + // moveNext after last goes back to origin, &vv + + bool canMoveNext = mllast`moveNext; + bool canMovePrev = mlfirst`movePrev; + + assert( ! canMoveNext ); + assert( ! canMovePrev ); + + assert( &mlorigin == & mlfirst ); + assert( &mlorigin == & mllast ); + + printf("origin_mutation cases done\n"); +} + +//////////////////////////////////////////////////////////// +// // Section 5 // @@ -1404,5 +1616,5 @@ int main() { - +#if 0 sout | "~~~~~~~~~~~~~~~~~ Headless List Tests - insert_after ~~~~~~~~~~~~~~~~"; sout | ""; @@ -1441,5 +1653,5 @@ sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; test__insertbefore_singleton_on_singleton__mary(); - +#endif sout | ""; sout | "~~~~~~~~~~~~~~~~~ Headed List Tests - insert_first ~~~~~~~~~~~~~~~~~~"; @@ -1517,4 +1729,5 @@ sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; test__insertbefore_before_first__mary(); +#if 0 sout | ""; @@ -1574,5 +1787,5 @@ sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; test__remove_at_last__mary(); - +#endif sout | ""; sout | "~~~~~~~~~~ Element removal tests on Headed List: at first ~~~~~~~~~~"; @@ -1670,4 +1883,26 @@ test__pop_last__maries(); + sout | ""; + sout | "~~~~~~~~~~~~~~~~~~~ Ease-of-access cases ~~~~~~~~~~~~~~~~~~"; + sout | ""; + + sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + sout | "Test 18-i. Modifying Freds on MINE"; + sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + sout | "Not implmented"; + + sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + sout | "Test 18-ii. Modifying Freds on YOURS"; + sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + sout | "Not implmented"; + + sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + sout | "Test 18-iii. Modifying Maries"; + sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + + test__accessor_cases__mary(); + test__try_pop__mary(); + test__origin_mutation__mary(); + return 0; } Index: tests/zombies/linked-list-perf/experiment.cpp =================================================================== --- tests/zombies/linked-list-perf/experiment.cpp (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/zombies/linked-list-perf/experiment.cpp (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,1 @@ +experiment.koad Index: tests/zombies/linked-list-perf/experiment.koad =================================================================== --- tests/zombies/linked-list-perf/experiment.koad (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/zombies/linked-list-perf/experiment.koad (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,203 @@ +/* + +$cfa is the result of building this configuration: +../cfa-cc/configure --with-target-hosts=host:nodebug CXX=g++- + +~/u++ is my own download of uC++ 7.0.0 + +$cfa -xc experiment.koad -DIMPL_CFA_MIKE_OLD -o perfexp-cfa-mike-old -nodebug -O2 +$cfa -xc experiment.koad -DIMPL_CFA_MIKE_NEW -o perfexp-cfa-mike-new -nodebug -O2 +$cfa -xc experiment.koad -DIMPL_CFA_MIKE_POC -o perfexp-cfa-mike-poc -nodebug -O2 +$cfa -xc experiment.koad -DIMPL_CFA_COLBY -o perfexp-cfa-colby -nodebug -O2 +$cfa -xc experiment.koad -DIMPL_CFA_THIERRY_SUB -o perfexp-cfa-thierry-sub -nodebug -O2 +g++ -xc++ experiment.koad -DIMPL_STL -DNDEBUG -o perfexp-stlgpp -O2 +~/u++/u++-7.0.0/bin/u++ experiment.cpp -DIMPL_UPP -DNDEBUG -o perfexp-uppupp -O2 + + O2 O2-ltd O3-ltd +perfexp-cfa-mike-old 2.50 2.55 +perfexp-cfa-mike-new 2.18 2.15 +perfexp-cfa-mike-poc 1.74 1.71 +perfexp-cfa-colby 2.90 2.84 3.09 +perfexp-cfa-thierry-sub 1.85 +perfexp-stlgpp 4.57 4.72 +perfexp-uppupp 2.09 1.94 1.91 + +O2-ltd is + -fno-tree-pre -fno-gcse + (An earlier draft of mike-new didn't work without disabling those optimizations; we probably don't care about that anymore.) + +*/ + +#include +#include + +#if defined IMPL_STL + + #include + struct S { + volatile int f[64]; + }; + +#elif defined IMPL_UPP + + #include + #include + struct S : public uSeqable { + volatile int f[64]; + }; + +#elif defined IMPL_CFA_MIKE_OLD + + #include "mike-old.hfa" + struct S { + int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD + DLISTED_MGD_IMPL_IN(S) + }; + DLISTED_MGD_IMPL_OUT(S) + +#elif defined IMPL_CFA_MIKE_POC + + #include "mike-proto-list.hfa" + struct S { + int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD + inline dlink(S); + }; + P9_EMBEDDED( S, dlink(S) ) + +#elif defined IMPL_CFA_MIKE_NEW + + #include + struct S { + int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD + inline dlink(S); + }; + P9_EMBEDDED( S, dlink(S) ) + +#elif defined IMPL_CFA_COLBY + + #include + struct S { + inline Seqable; + int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD + }; + static inline S *& Back( S * n ) { + return (S *)Back( (Seqable *)n ); + } + static inline S *& Next( S * n ) { + return (S *)Next( (Colable *)n ); + } + +#elif defined IMPL_CFA_THIERRY_SUB + + #include "thierry-subqueue-old-rip.hfa" + typedef $thread S; + + +#else + #error bad impl +#endif + + +#define Repeat( op ) for ( volatile unsigned int i = 0; i < NoOfNodes; i += 1 ) { op; } + +int main() { + enum { NoOfNodes = 1000, Times = 100000 }; // Times supposed to be 100000 + S s[NoOfNodes]; + clock_t start, end; + const char * impl = 0; + + #define STATS + #define REPORT do { \ + double elapsed = ((double) (end - start)) / CLOCKS_PER_SEC; \ + printf("%s %f sec\n", impl, elapsed); \ + STATS \ + } while(0); + + #if defined IMPL_STL + do { + std::list lst; + start = clock(); + for ( volatile unsigned int t = 0; t < Times; t += 1 ) { + Repeat( lst.push_back( &s[i] ) ); + Repeat( lst.pop_front() ); + } + end = clock(); + impl = "STL list, pointer"; + REPORT + } while (0); + #elif defined IMPL_UPP + do { + uSequence lst; + start = clock(); + for ( volatile unsigned int t = 0; t < Times; t += 1 ) { + Repeat( lst.addTail( &s[i] ) ); + Repeat( lst.dropHead() ); + } + end = clock(); + impl = "u++ intrusive list"; + REPORT + } while (0); + #elif defined IMPL_CFA_MIKE_OLD + do { + dlist(S, S) lst; + start = clock(); + for ( volatile unsigned int t = 0; t < Times; t += 1 ) { + Repeat( insert_last( lst, s[i] ) ); + Repeat( remove( lst`first ) ); + } + end = clock(); + impl = "cfa mike-old intrusive list"; + REPORT + } while (0); + #elif defined IMPL_CFA_MIKE_POC + do { + dlist(S) lst; + start = clock(); + for ( volatile unsigned int t = 0; t < Times; t += 1 ) { + Repeat( insert_last( lst, s[i] ) ); + Repeat( remove_first( lst ) ); + } + end = clock(); + impl = "cfa mike-poc intrusive list"; + REPORT + } while (0); + #elif defined IMPL_CFA_MIKE_NEW + do { + dlist(S) lst; + start = clock(); + for ( volatile unsigned int t = 0; t < Times; t += 1 ) { + Repeat( insert_last( lst, s[i] ) ); + Repeat( remove( lst`first ) ); + } + end = clock(); + impl = "cfa mike-new intrusive list"; + REPORT + } while (0); + #elif defined IMPL_CFA_COLBY + do { + Sequence(S) lst; + start = clock(); + for ( volatile unsigned int t = 0; t < Times; t += 1 ) { + Repeat( addHead( lst, s[i] ) ); + Repeat( dropTail( lst ) ); + } + end = clock(); + impl = "cfa colby intrusive list"; + REPORT + } while (0); + + #elif defined IMPL_CFA_THIERRY_SUB + do { + __intrusive_lane_t lst; + start = clock(); + for ( volatile unsigned int t = 0; t < Times; t += 1 ) { + Repeat( push( lst, &s[i] ) ); + Repeat( pop( lst ) ); + } + end = clock(); + impl = "cfa thierry subqueue intrusive list"; + REPORT + } while (0); + + #endif +} Index: tests/zombies/linked-list-perf/mike-old.hfa =================================================================== --- tests/zombies/linked-list-perf/mike-old.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/zombies/linked-list-perf/mike-old.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,351 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2020 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// list -- lets a user-defined stuct form intrusive linked lists +// +// Author : Michael Brooks +// Created On : Wed Apr 22 18:00:00 2020 +// Last Modified By : Michael Brooks +// Last Modified On : Wed Apr 22 18:00:00 2020 +// Update Count : 1 +// + +#pragma once + +#include + +#define __DLISTED_MGD_COMMON(ELEM, NODE, LINKS_FLD) \ +static inline ELEM& $tempcv_n2e(NODE &node) { \ + return node; \ +} \ +\ +static inline NODE& $tempcv_e2n(ELEM &node) { \ + return ( NODE & ) node; \ +} \ +\ +static inline ELEM & ?`prev(NODE &node) { \ + $dlinks(ELEM) & ls = node.LINKS_FLD; \ + $mgd_link(ELEM) * l = &ls.prev; \ + ELEM * e = l->elem; \ + return *e; \ +} \ +\ +static inline ELEM & ?`next(NODE &node) { \ + $dlinks(ELEM) & ls = node.LINKS_FLD; \ + $mgd_link(ELEM) * l = &ls.next; \ + ELEM * e = l->elem; \ + return *e; \ +} \ +\ +static inline $mgd_link(ELEM) & $prev_link(NODE &node) { \ + $dlinks(ELEM) & ls = node.LINKS_FLD; \ + $mgd_link(ELEM) * l = &ls.prev; \ + return *l; \ +} \ +\ +static inline $mgd_link(ELEM) & $next_link(NODE &node) { \ + $dlinks(ELEM) & ls = node.LINKS_FLD; \ + $mgd_link(ELEM) * l = &ls.next; \ + return *l; \ +} + +#define __DLISTED_MGD_JUSTEXPL(STRUCT, IN_THELIST, STRUCT_IN_THELIST) \ +struct STRUCT_IN_THELIST { \ + inline STRUCT; \ +}; \ +\ +void ?{}(STRUCT_IN_THELIST &) = void; \ +\ +static inline STRUCT_IN_THELIST& ?`IN_THELIST(STRUCT &this) { \ + return (STRUCT_IN_THELIST&)this; \ +} + +#define __DLISTED_MGD_JUSTIMPL(STRUCT) + +forall( tE & ) { + struct $mgd_link { + tE *elem; + void *terminator; + _Bool is_terminator; + // will collapse to single pointer with tag bit + }; + static inline void ?{}( $mgd_link(tE) &this, tE* elem ) { + (this.elem){ elem }; + (this.terminator){ 0p }; + (this.is_terminator){ 0 }; + } + static inline void ?{}( $mgd_link(tE) &this, void * terminator ) { + (this.elem){ 0p }; + (this.terminator){ terminator }; + (this.is_terminator){ 1 }; + } + static inline void ?=?( $mgd_link(tE) &this, tE* elem ) { + this.elem = elem ; + this.terminator = 0p; + this.is_terminator = 0; + } + static inline void ?=?( $mgd_link(tE) &this, void * terminator ) { + this.elem = 0p; + this.terminator = terminator; + this.is_terminator = 1; + } + struct $dlinks { + // containing item is not listed + // iff + // links have (elem == 0p && terminator == 0p) + $mgd_link(tE) next; + $mgd_link(tE) prev; + }; + static inline void ?{}( $dlinks(tE) &this ) { + (this.next){ (tE *)0p }; + (this.prev){ (tE *)0p }; + } +} + +#define DLISTED_MGD_EXPL_IN(STRUCT, LIST_SUF) \ + $dlinks(STRUCT) $links_ ## LIST_SUF; + +#define DLISTED_MGD_EXPL_OUT(STRUCT, LIST_SUF) \ + __DLISTED_MGD_JUSTEXPL(STRUCT, in_##LIST_SUF, STRUCT ## _in_ ## LIST_SUF) \ + __DLISTED_MGD_COMMON(STRUCT, STRUCT##_in_##LIST_SUF, $links_ ## LIST_SUF) + +#define DLISTED_MGD_IMPL_IN(STRUCT) \ + $dlinks(STRUCT) $links; + +#define DLISTED_MGD_IMPL_OUT(STRUCT) \ + __DLISTED_MGD_JUSTIMPL(STRUCT) \ + __DLISTED_MGD_COMMON(STRUCT, STRUCT, $links) + +trait $dlistable(Tnode &, Telem &) { + $mgd_link(Telem) & $prev_link(Tnode &); + $mgd_link(Telem) & $next_link(Tnode &); + Telem& $tempcv_n2e(Tnode &); + Tnode& $tempcv_e2n(Telem &); + + Telem& ?`next(Tnode &); + Telem& ?`prev(Tnode &); +}; + +forall (Tnode &, Telem & | $dlistable(Tnode, Telem)) { + + // implemented as a sentinel item in an underlying cicrular list + // theList.$links.next is first + // theList.$links.prev is last + // note this allocation preserves prev-next composition as an identity + struct dlist { + $dlinks(Telem) $links; + }; + + // an empty dlist + // links refer to self, making a tight circle + static inline void ?{}( dlist(Tnode, Telem) & this ) { + $mgd_link(Telem) selfRef = (void *) &this; + ( this.$links ) { selfRef, selfRef }; + } + + static inline Telem & ?`first( dlist(Tnode, Telem) &l ) { + return * l.$links.next.elem; + } + + static inline Telem & ?`last( dlist(Tnode, Telem) &l ) { + return * l.$links.prev.elem; + } + + #if !defined(NDEBUG) && (defined(__CFA_DEBUG__) || defined(__CFA_VERIFY__)) + static bool $validate_fwd( dlist(Tnode, Telem) & this ) { + Tnode * it = & $tempcv_e2n( this`first ); + if (!it) return (& this`last == 0p); + + while( $next_link(*it).elem ) { + it = & $tempcv_e2n( * $next_link(*it).elem ); + } + + return ( it == & $tempcv_e2n( this`last ) ) && + ( $next_link(*it).is_terminator ) && + ( ((dlist(Tnode, Telem)*)$next_link(*it).terminator) == &this ); + } + static bool $validate_rev( dlist(Tnode, Telem) & this ) { + Tnode * it = & $tempcv_e2n( this`last ); + if (!it) return (& this`first == 0p); + + while( $prev_link(*it).elem ) { + it = & $tempcv_e2n( * $prev_link(*it).elem ); + } + + return ( it == & $tempcv_e2n( this`first ) ) && + ( $prev_link(*it).is_terminator ) && + ( ((dlist(Tnode, Telem)*)$prev_link(*it).terminator) == &this ); + } + static bool validate( dlist(Tnode, Telem) & this ) { + return $validate_fwd(this) && $validate_rev(this); + } + #endif + + static inline void insert_after(Tnode &list_pos, Telem &to_insert) { + verify (&list_pos != 0p); + verify (&to_insert != 0p); + Tnode &singleton_to_insert = $tempcv_e2n(to_insert); + verify($prev_link(singleton_to_insert).elem == 0p); + verify($next_link(singleton_to_insert).elem == 0p); + $prev_link(singleton_to_insert) = & $tempcv_n2e(list_pos); + $next_link(singleton_to_insert) = $next_link(list_pos); + if ($next_link(list_pos).is_terminator) { + dlist(Tnode, Telem) *list = ( dlist(Tnode, Telem) * ) $next_link(list_pos).terminator; + $dlinks(Telem) *list_links = & list->$links; + $mgd_link(Telem) *list_last = & list_links->prev; + *list_last = &to_insert; + } else { + Telem *list_pos_next = $next_link(list_pos).elem; + if (list_pos_next) { + Tnode & lpn_inlist = $tempcv_e2n(*list_pos_next); + $prev_link(lpn_inlist) = &to_insert; + } + } + $next_link(list_pos) = &to_insert; + } + + static inline void insert_before(Tnode &list_pos, Telem &to_insert) { + verify (&list_pos != 0p); + verify (&to_insert != 0p); + Tnode &singleton_to_insert = $tempcv_e2n(to_insert); + verify($prev_link(singleton_to_insert).elem == 0p); + verify($next_link(singleton_to_insert).elem == 0p); + $next_link(singleton_to_insert) = & $tempcv_n2e(list_pos); + $prev_link(singleton_to_insert) = $prev_link(list_pos); + if ($prev_link(list_pos).is_terminator) { + dlist(Tnode, Telem) *list = ( dlist(Tnode, Telem) * ) $prev_link(list_pos).terminator; + $dlinks(Telem) *list_links = & list->$links; + $mgd_link(Telem) *list_first = & list_links->next; + *list_first = &to_insert; + } else { + Telem *list_pos_prev = $prev_link(list_pos).elem; + if (list_pos_prev) { + Tnode & lpp_inlist = $tempcv_e2n(*list_pos_prev); + $next_link(lpp_inlist) = &to_insert; + } + } + $prev_link(list_pos) = &to_insert; + } + + static inline void insert_first(dlist(Tnode, Telem) &list, Telem &to_insert) { + verify (&list != 0p); + verify (&to_insert != 0p); + Tnode &singleton_to_insert = $tempcv_e2n(to_insert); + verify($prev_link(singleton_to_insert).elem == 0p); + verify($next_link(singleton_to_insert).elem == 0p); + + $prev_link(singleton_to_insert) = (void*) &list; + $next_link(singleton_to_insert) = list.$links.next; + + $dlinks(Telem) *listLinks = & list.$links; + if (listLinks->next.is_terminator) { + $mgd_link(Telem) * listPrevReference = & listLinks->prev; + *listPrevReference = &to_insert; + } else { + Tnode & next_inlist = $tempcv_e2n(*list.$links.next.elem); + $prev_link(next_inlist) = &to_insert; + } + $mgd_link(Telem) * listNextReference = & listLinks->next; + *listNextReference = &to_insert; + } + + static inline void insert_last(dlist(Tnode, Telem) &list, Telem &to_insert) { + verify (&list != 0p); + verify (&to_insert != 0p); + Tnode &singleton_to_insert = $tempcv_e2n(to_insert); + verify($next_link(singleton_to_insert).elem == 0p); + verify($prev_link(singleton_to_insert).elem == 0p); + + $next_link(singleton_to_insert) = (void*) &list; + $prev_link(singleton_to_insert) = list.$links.prev; + + $dlinks(Telem) *listLinks = & list.$links; + if (listLinks->prev.is_terminator) { + $mgd_link(Telem) * listNextReference = & listLinks->next; + *listNextReference = &to_insert; + } else { + Tnode & prev_inlist = $tempcv_e2n(*list.$links.prev.elem); + $next_link(prev_inlist) = &to_insert; + } + $mgd_link(Telem) * listPrevReference = & listLinks->prev; + *listPrevReference = &to_insert; + } + + static inline void remove(Tnode &list_pos) { + verify( &list_pos != 0p ); + + $mgd_link(Telem) &incoming_from_prev = *0p; + $mgd_link(Telem) &incoming_from_next = *0p; + + if ( $prev_link(list_pos).is_terminator ) { + dlist(Tnode, Telem) * tgt_before = ( dlist(Tnode, Telem) * ) $prev_link(list_pos).terminator; + $dlinks(Telem) * links_before = & tgt_before->$links; + &incoming_from_prev = & links_before->next; + } else if ($prev_link(list_pos).elem) { + Telem * tgt_before = $prev_link(list_pos).elem; + Tnode & list_pos_before = $tempcv_e2n(*tgt_before); + &incoming_from_prev = & $next_link(list_pos_before); + } + + if ( $next_link(list_pos).is_terminator ) { + dlist(Tnode, Telem) * tgt_after = ( dlist(Tnode, Telem) * ) $next_link(list_pos).terminator; + $dlinks(Telem) * links_after = & tgt_after->$links; + &incoming_from_next = & links_after->prev; + } else if ($next_link(list_pos).elem) { + Telem * tgt_after = $next_link(list_pos).elem; + Tnode & list_pos_after = $tempcv_e2n(*tgt_after ); + &incoming_from_next = & $prev_link(list_pos_after ); + } + + if (& incoming_from_prev) { + incoming_from_prev = $next_link(list_pos); + } + if (& incoming_from_next) { + incoming_from_next = $prev_link(list_pos); + } + + $next_link(list_pos) = (Telem*) 0p; + $prev_link(list_pos) = (Telem*) 0p; + } + + static inline bool ?`is_empty(dlist(Tnode, Telem) &list) { + verify( &list != 0p ); + $dlinks(Telem) *listLinks = & list.$links; + if (listLinks->next.is_terminator) { + verify(listLinks->prev.is_terminator); + verify(listLinks->next.terminator); + verify(listLinks->prev.terminator); + return true; + } else { + verify(!listLinks->prev.is_terminator); + verify(listLinks->next.elem); + verify(listLinks->prev.elem); + return false; + } + } + + static inline Telem & pop_first(dlist(Tnode, Telem) &list) { + verify( &list != 0p ); + verify( !list`is_empty ); + $dlinks(Telem) *listLinks = & list.$links; + Telem & first = *listLinks->next.elem; + Tnode & list_pos_first = $tempcv_e2n( first ); + remove(list_pos_first); + return first; + } + + static inline Telem & pop_last(dlist(Tnode, Telem) &list) { + verify( &list != 0p ); + verify( !list`is_empty ); + $dlinks(Telem) *listLinks = & list.$links; + Telem & last = *listLinks->prev.elem; + Tnode & list_pos_last = $tempcv_e2n( last ); + remove(list_pos_last); + return last; + } + +} + Index: tests/zombies/linked-list-perf/mike-proto-list.hfa =================================================================== --- tests/zombies/linked-list-perf/mike-proto-list.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/zombies/linked-list-perf/mike-proto-list.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,75 @@ +#include + +forall( tE & ) { + + struct dlink{ + tE *next; + tE *prev; + }; + + static inline void ?{}( dlink(tE) & this ) { + this.next = 0p; + this.prev = 0p; + } + + forall( tLinks & = dlink(tE) ) { + struct dlist{ + tE *first; + tE *last; + }; + + static inline void ?{}( dlist(tE, tLinks) & this ) { + this.first = 0p; + this.last = 0p; + } + } +} + +trait embedded( tOuter &, tInner & ) { + tInner & ?`inner( tOuter & ); +}; + +// embedded is reflexive +forall( tX & ) +static inline tX & ?`inner( tX & this ) { return this; } + +// use this on every case of plan-9 inheritance, to make embedded a closure of plan-9 inheritance +#define P9_EMBEDDED( tOuter, tInner ) \ + static inline tInner & ?`inner( tOuter & this ) { return this; } + + +forall( tE &, tLinks & | embedded( tE, tLinks ) | embedded( tLinks, dlink(tE) ) ) { + static inline void insert_last( dlist(tE, tLinks) &lst, tE & e ) { + if (lst.last) { + verify(lst.first); + dlink(tE) & oldLastLinks = (*lst.last)`inner`inner; + verify(oldLastLinks.next == 0p); + oldLastLinks.next = & e; + } else { + verify(!lst.first); + lst.first = &e; + } + dlink(tE) & newLastLinks = e`inner`inner; + verify(newLastLinks.prev == 0p); + verify(newLastLinks.next == 0p); + newLastLinks.prev = lst.last; + lst.last = &e; + } + static inline void remove_first( dlist(tE, tLinks) &lst ) { + verify(lst.first && lst.last); + dlink(tE) & oldFirstLinks = (*lst.first)`inner`inner; + verify(oldFirstLinks.prev == 0p); + if( lst.last != lst.first) { + verify(oldFirstLinks.next != 0p); + tE & newFirst = * oldFirstLinks.next; + dlink(tE) & newFirstLinks = (newFirst)`inner`inner; + oldFirstLinks.next = 0p; + newFirstLinks.prev = 0p; + lst.first = & newFirst; + } else { + verify(oldFirstLinks.next == 0p); + lst.last = 0p; + lst.first = 0p; + } + } +} Index: tests/zombies/linked-list-perf/thierry-subqueue-old-rip.hfa =================================================================== --- tests/zombies/linked-list-perf/thierry-subqueue-old-rip.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) +++ tests/zombies/linked-list-perf/thierry-subqueue-old-rip.hfa (revision fc1347d0307b24d6841b90f1cee2e3c16d759e52) @@ -0,0 +1,255 @@ +#include +#include +struct $thread; +struct __thread_desc_link { + struct $thread * next; + struct $thread * prev; + volatile unsigned long long ts; + int preferred; +}; +struct $thread { + int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD + struct __thread_desc_link link; +}; + +// Intrusives lanes which are used by the relaxed ready queue +struct __attribute__((aligned(128))) __intrusive_lane_t { + + #if defined(USE_MPSC) + mpsc_queue($thread) queue; + __attribute__((aligned(128))) + #else + // anchor for the head and the tail of the queue + __attribute__((aligned(128))) struct __sentinel_t { + // Link lists fields + // instrusive link field for threads + // must be exactly as in $thread + __thread_desc_link link; + } before, after; + #endif + + // spin lock protecting the queue + volatile bool lock; + + // Optional statistic counters + #if !defined(__CFA_NO_SCHED_STATS__) + struct __attribute__((aligned(64))) { + // difference between number of push and pops + ssize_t diff; + + // total number of pushes and pops + size_t push; + size_t pop ; + } stat; + #endif +}; + +void ?{}(__intrusive_lane_t & this); +void ^?{}(__intrusive_lane_t & this); + +// Get the head pointer (one before the first element) from the anchor +static inline $thread * head(const __intrusive_lane_t & this) { + #if defined(USE_MPSC) + return this.queue.head; + #else + $thread * rhead = ($thread *)( + (uintptr_t)( &this.before ) - offsetof( $thread, link ) + ); + /* paranoid */ verify(rhead); + return rhead; + #endif +} + +// Get the tail pointer (one after the last element) from the anchor +static inline $thread * tail(const __intrusive_lane_t & this) { + #if defined(USE_MPSC) + return this.queue.tail; + #else + $thread * rtail = ($thread *)( + (uintptr_t)( &this.after ) - offsetof( $thread, link ) + ); + /* paranoid */ verify(rtail); + return rtail; + #endif +} + +// Ctor +void ?{}( __intrusive_lane_t & this ) { + this.lock = false; + + #if !defined(USE_MPSC) + this.before.link.prev = 0p; + this.before.link.next = tail(this); + this.before.link.ts = 0; + + this.after .link.prev = head(this); + this.after .link.next = 0p; + this.after .link.ts = 0; + + #if !defined(__CFA_NO_SCHED_STATS__) + this.stat.diff = 0; + this.stat.push = 0; + this.stat.pop = 0; + #endif + + // We add a boat-load of assertions here because the anchor code is very fragile + /* paranoid */ verify(((uintptr_t)( head(this) ) + offsetof( $thread, link )) == (uintptr_t)(&this.before)); + /* paranoid */ verify(((uintptr_t)( tail(this) ) + offsetof( $thread, link )) == (uintptr_t)(&this.after )); + /* paranoid */ verify(head(this)->link.prev == 0p ); + /* paranoid */ verify(head(this)->link.next == tail(this) ); + /* paranoid */ verify(tail(this)->link.next == 0p ); + /* paranoid */ verify(tail(this)->link.prev == head(this) ); + /* paranoid */ verify(&head(this)->link.prev == &this.before.link.prev ); + /* paranoid */ verify(&head(this)->link.next == &this.before.link.next ); + /* paranoid */ verify(&tail(this)->link.prev == &this.after .link.prev ); + /* paranoid */ verify(&tail(this)->link.next == &this.after .link.next ); + /* paranoid */ verify(__alignof__(__intrusive_lane_t) == 128); + /* paranoid */ verify(__alignof__(this) == 128); + /* paranoid */ verifyf(((intptr_t)(&this) % 128) == 0, "Expected address to be aligned %p %% 128 == %zd", &this, ((intptr_t)(&this) % 128)); + #endif +} + +// Dtor is trivial +void ^?{}( __intrusive_lane_t & this ) { + #if !defined(USE_MPSC) + // Make sure the list is empty + /* paranoid */ verify(head(this)->link.prev == 0p ); + /* paranoid */ verify(head(this)->link.next == tail(this) ); + /* paranoid */ verify(tail(this)->link.next == 0p ); + /* paranoid */ verify(tail(this)->link.prev == head(this) ); + #endif +} + +// Push a thread onto this lane +// returns true of lane was empty before push, false otherwise +bool push(__intrusive_lane_t & this, $thread * node) { + #if defined(USE_MPSC) + inline $thread * volatile & ?`next ( $thread * this ) __attribute__((const)) { + return this->link.next; + } + push(this.queue, node); + #else + #if defined(__CFA_WITH_VERIFY__) + /* paranoid */ verify(this.lock); + /* paranoid */ verify(node->link.ts != 0); + /* paranoid */ verify(node->link.next == 0p); + /* paranoid */ verify(node->link.prev == 0p); + /* paranoid */ verify(tail(this)->link.next == 0p); + /* paranoid */ verify(head(this)->link.prev == 0p); + + if(this.before.link.ts == 0l) { + /* paranoid */ verify(tail(this)->link.prev == head(this)); + /* paranoid */ verify(head(this)->link.next == tail(this)); + } else { + /* paranoid */ verify(tail(this)->link.prev != head(this)); + /* paranoid */ verify(head(this)->link.next != tail(this)); + } + #endif + + // Get the relevant nodes locally + $thread * tail = tail(this); + $thread * prev = tail->link.prev; + + // Do the push + node->link.next = tail; + node->link.prev = prev; + prev->link.next = node; + tail->link.prev = node; + + // Update stats + #if !defined(__CFA_NO_SCHED_STATS__) + this.stat.diff++; + this.stat.push++; + #endif + + verify(node->link.next == tail(this)); + + // Check if the queue used to be empty + if(this.before.link.ts == 0l) { + this.before.link.ts = node->link.ts; + /* paranoid */ verify(node->link.prev == head(this)); + return true; + } + return false; + #endif +} + +// Pop a thread from this lane (must be non-empty) +// returns popped +// returns true of lane was empty before push, false otherwise +$thread * pop(__intrusive_lane_t & this) { + /* paranoid */ verify(this.lock); + #if defined(USE_MPSC) + inline $thread * volatile & ?`next ( $thread * this ) __attribute__((const)) { + return this->link.next; + } + return pop(this.queue); + #else + /* paranoid */ verify(this.before.link.ts != 0ul); + + // Get anchors locally + $thread * head = head(this); + $thread * tail = tail(this); + + // Get the relevant nodes locally + $thread * node = head->link.next; + $thread * next = node->link.next; + + /* paranoid */ verify(node != tail); + /* paranoid */ verify(node); + + // Do the pop + head->link.next = next; + next->link.prev = head; + node->link.next = 0p; + node->link.prev = 0p; + + // Update head time stamp + this.before.link.ts = next->link.ts; + + // Update stats + #ifndef __CFA_NO_SCHED_STATS__ + this.stat.diff--; + this.stat.pop ++; + #endif + + // Check if we emptied list and return accordingly + /* paranoid */ verify(tail(this)->link.next == 0p); + /* paranoid */ verify(head(this)->link.prev == 0p); + if(next == tail) { + /* paranoid */ verify(this.before.link.ts == 0); + /* paranoid */ verify(tail(this)->link.prev == head(this)); + /* paranoid */ verify(head(this)->link.next == tail(this)); + return node; + } + else { + /* paranoid */ verify(next->link.ts != 0); + /* paranoid */ verify(tail(this)->link.prev != head(this)); + /* paranoid */ verify(head(this)->link.next != tail(this)); + /* paranoid */ verify(this.before.link.ts != 0); + return node; + } + #endif +} + +// Check whether or not list is empty +static inline bool is_empty(__intrusive_lane_t & this) { + #if defined(USE_MPSC) + return this.queue.head == 0p; + #else + // Cannot verify here since it may not be locked + return this.before.link.ts == 0; + #endif +} + +// Return the timestamp +static inline unsigned long long ts(__intrusive_lane_t & this) { + #if defined(USE_MPSC) + $thread * tl = this.queue.head; + if(!tl) return -1ull; + return tl->link.ts; + #else + // Cannot verify here since it may not be locked + return this.before.link.ts; + #endif +}