Skip to content

Commit

Permalink
Rename assumeUnshared to assumeThreadLocal
Browse files Browse the repository at this point in the history
  • Loading branch information
@lempiji
lempiji committed Nov 12, 2017
1 parent 8c1cb27 commit bafd2d2
Show file tree
Hide file tree
Showing 12 changed files with 121 additions and 85 deletions.
8 changes: 4 additions & 4 deletions docs.json
View file
Expand Up @@ -6112,7 +6112,7 @@
"members": [
{
"endchar": 1,
"name": "assumeUnshared",
"name": "assumeThreadLocal",
"line": 8,
"type": "ref T(auto ref T obj)",
"parameters": [
Expand All @@ -6133,7 +6133,7 @@
]
}
],
"name": "assumeUnshared",
"name": "assumeThreadLocal",
"line": 8,
"parameters": [
{
Expand All @@ -6149,7 +6149,7 @@
"members": [
{
"endchar": 1,
"name": "assumeUnshared",
"name": "assumeThreadLocal",
"line": 13,
"type": "ref T(auto ref shared(T) obj)",
"parameters": [
Expand All @@ -6170,7 +6170,7 @@
]
}
],
"name": "assumeUnshared",
"name": "assumeThreadLocal",
"line": 13,
"parameters": [
{
Expand Down
2 changes: 1 addition & 1 deletion docs/file_hashes.json
View file

Large diffs are not rendered by default.

78 changes: 51 additions & 27 deletions docs/rx/disposable/disposableObject.html
View file
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8"/>
<title>Function disposableObject</title>
<title>Class DisposableObject</title>
<link rel="stylesheet" type="text/css" href="../../styles/ddox.css"/>
<link rel="stylesheet" href="../../prettify/prettify.css" type="text/css"/>
<script type="text/javascript" src="../../scripts/jquery.js">/**/</script><script type="text/javascript" src="../../scripts/ddox.js">/**/</script>
Expand Down Expand Up @@ -132,40 +132,64 @@
</ul>
</nav>
<div id="main-contents">
<h1>Function disposableObject</h1><p>Wraps dispose method in virtual functions.
<h1>Class DisposableObject</h1><p>Class that implements the Disposable interface and wraps the dispose methods in virtual functions.
</p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">auto </span><span class="kwd">auto</span> <span class="pln">disposableObject</span>(T)
<span class="pun">(</span>
<br/>
&nbsp;&nbsp;<span class="pln">T</span> <span class="pln">disposable</span>
<br/>
<span class="pun">)</span><span class="pun">;</span>
<span class="kwd">class</span> <span class="typ">DisposableObject</span>(T)
<span class="pun">;</span>
</div>
</code>
</div>

<section><h2>Example</h2>

<pre class="code"><code class="lang-d"><span class="typ">int </span><span class="pln">count </span><span class="pun">= </span><span class="lit">0</span><span class="pun">;
</span><span class="kwd">struct </span><span class="typ">TestDisposable
</span><span class="pun">{
</span><span class="typ">void </span><span class="pln">dispose</span><span class="pun">()
{
</span><span class="pln">count</span><span class="pun">++;
}
}

</span><span class="typ">TestDisposable </span><span class="pln">test</span><span class="pun">;
<a href="../../rx/disposable/Disposable.html"></span><span class="typ">Disposable</span></a><span class="pln"> disposable </span><span class="pun">= </span><span class="pln">disposableObject</span><span class="pun">(</span><span class="pln">test</span><span class="pun">);
</span><span class="kwd">assert</span><span class="pun">(</span><span class="pln">count </span><span class="pun">== </span><span class="lit">0</span><span class="pun">);
</span><span class="pln">disposable<wbr/></span><span class="pun">.</span><span class="pln">dispose</span><span class="pun">();
</span><span class="kwd">assert</span><span class="pun">(</span><span class="pln">count </span><span class="pun">== </span><span class="lit">1</span><span class="pun">);
</span></code></pre>
</section>

<section><h2>Constructors</h2>
<table>
<col class="caption"/>
<tr>
<th>Name</th><th>Description</th>
</tr>
<tr>
<td>
<a href="../../rx/disposable/DisposableObject.this.html" class="[&quot;public&quot;]">
<code>this</code>
</a>
</td>
<td></td>
</tr>
</table>
</section>
<section><h2>Fields</h2>
<table>
<col class="caption"/>
<tr>
<th>Name</th><th>Type</th><th>Description</th>
</tr>
<tr>
<td>
<a href="../../rx/disposable/DisposableObject._disposable.html" class="[&quot;public&quot;]"><code>_disposable</code></a>
</td>
<td class="typecol"><code class="prettyprint lang-d"><span class="pln">T</span></code></td><td></td>
</tr>
</table>
</section>
<section><h2>Methods</h2>
<table>
<col class="caption"/>
<tr>
<th>Name</th><th>Description</th>
</tr>
<tr>
<td>
<a href="../../rx/disposable/DisposableObject.dispose.html" class="[&quot;public&quot;]">
<code>dispose</code>
</a>
</td>
<td></td>
</tr>
</table>
</section>

<footer>
<table class="license-info">
<tr>
Expand Down
66 changes: 39 additions & 27 deletions docs/rx/observable/ObservableObject.html
View file
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8"/>
<title>Template observableObject</title>
<title>Class ObservableObject</title>
<link rel="stylesheet" type="text/css" href="../../styles/ddox.css"/>
<link rel="stylesheet" href="../../prettify/prettify.css" type="text/css"/>
<script type="text/javascript" src="../../scripts/jquery.js">/**/</script><script type="text/javascript" src="../../scripts/ddox.js">/**/</script>
Expand Down Expand Up @@ -132,52 +132,64 @@
</ul>
</nav>
<div id="main-contents">
<h1>Template observableObject</h1><p>Wraps subscribe method in virtual function.
<h1>Class ObservableObject</h1><p>Class that implements Observable interface and wraps the subscribe method in virtual function.
</p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">template</span> <span class="pln">observableObject</span>(E)
;
<span class="kwd">class</span> <span class="typ">ObservableObject</span>(R, E)
<span class="pun">;</span>
</div>
</code>
</div>

<section><h2>Contained Functions</h2>
<section><h2>Constructors</h2>
<table>
<col class="caption"/>
<tr>
<th>Name</th><th>Description</th>
</tr>
<tr>
<td>
<a href="../../rx/observable/observableObject.observableObject.html">observableObject</a>
<a href="../../rx/observable/ObservableObject.this.html" class="[&quot;public&quot;]">
<code>this</code>
</a>
</td>
<td></td>
</tr>
</table>
</section>
<section><h2>Example</h2>

<pre class="code"><code class="lang-d"><span class="typ">int </span><span class="pln">subscribeCount </span><span class="pun">= </span><span class="lit">0</span><span class="pun">;
</span><span class="kwd">class </span><span class="typ">TestObservable </span><span class="pun">: <a href="../../rx/observable/Observable.html"></span><span class="typ">Observable</span></a><span class="pun">!</span><span class="typ">int
</span><span class="pun">{
</span><span class="typ">Disposable </span><span class="pln">subscribe</span><span class="pun">(</span><span class="typ">Observer</span><span class="pun">!</span><span class="typ">int </span><span class="pln">observer</span><span class="pun">)
{
</span><span class="pln">subscribeCount</span><span class="pun">++;
</span><span class="kwd">return </span><span class="typ">NopDisposable<wbr/></span><span class="pun">.</span><span class="pln">instance</span><span class="pun">;
}
}

</span><span class="kwd">auto </span><span class="pln">test </span><span class="pun">= </span><span class="kwd">new </span><span class="typ">TestObservable</span><span class="pun">;
</span><span class="kwd">auto </span><span class="pln">observable </span><span class="pun">= <a href="../../rx/observable/observableObject.observableObject.html"></span><span class="pln">observableObject</span></a><span class="pun">!</span><span class="typ">int</span><span class="pun">(</span><span class="pln">test</span><span class="pun">);
</span><span class="kwd">assert</span><span class="pun">(</span><span class="pln">observable </span><span class="kwd">is </span><span class="pln">test</span><span class="pun">);
</span><span class="kwd">assert</span><span class="pun">(</span><span class="pln">subscribeCount </span><span class="pun">== </span><span class="lit">0</span><span class="pun">);
</span><span class="kwd">auto </span><span class="pln">d </span><span class="pun">= </span><span class="pln">observable<wbr/></span><span class="pun">.</span><span class="pln">subscribe</span><span class="pun">(</span><span class="kwd">null</span><span class="pun">);
</span><span class="kwd">assert</span><span class="pun">(</span><span class="pln">subscribeCount </span><span class="pun">== </span><span class="lit">1</span><span class="pun">);
</span></code></pre>
</section>

<section><h2>Fields</h2>
<table>
<col class="caption"/>
<tr>
<th>Name</th><th>Type</th><th>Description</th>
</tr>
<tr>
<td>
<a href="../../rx/observable/ObservableObject._observable.html" class="[&quot;public&quot;]"><code>_observable</code></a>
</td>
<td class="typecol"><code class="prettyprint lang-d"><span class="pln">R</span></code></td><td></td>
</tr>
</table>
</section>
<section><h2>Methods</h2>
<table>
<col class="caption"/>
<tr>
<th>Name</th><th>Description</th>
</tr>
<tr>
<td>
<a href="../../rx/observable/ObservableObject.subscribe.html" class="[&quot;public&quot;]">
<code>subscribe</code>
</a>
</td>
<td></td>
</tr>
</table>
</section>

<footer>
<table class="license-info">
<tr>
Expand Down
4 changes: 2 additions & 2 deletions docs/rx/util.html
View file
Expand Up @@ -144,15 +144,15 @@ <h2>Functions</h2>
<tr>
<td>
<code>
<a id="assumeUnshared" class="[&quot;public&quot;]" href="../rx/util/assumeUnshared.html">assumeUnshared</a><span class="decoration">(obj)</span>
<a id="assumeThreadLocal" class="[&quot;public&quot;]" href="../rx/util/assumeThreadLocal.html">assumeThreadLocal</a><span class="decoration">(obj)</span>
</code>
</td>
<td></td>
</tr>
<tr>
<td>
<code>
<a id="assumeUnshared" class="[&quot;public&quot;]" href="../rx/util/assumeUnshared.html">assumeUnshared</a><span class="decoration">(obj)</span>
<a id="assumeThreadLocal" class="[&quot;public&quot;]" href="../rx/util/assumeThreadLocal.html">assumeThreadLocal</a><span class="decoration">(obj)</span>
</code>
</td>
<td></td>
Expand Down
16 changes: 8 additions & 8 deletions docs/rx/util/assumeUnshared.html → docs/rx/util/assumeThreadLocal.html
View file
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8"/>
<title>assumeUnshared - multiple declarations</title>
<title>assumeThreadLocal - multiple declarations</title>
<link rel="stylesheet" type="text/css" href="../../styles/ddox.css"/>
<link rel="stylesheet" href="../../prettify/prettify.css" type="text/css"/>
<script type="text/javascript" src="../../scripts/jquery.js">/**/</script><script type="text/javascript" src="../../scripts/ddox.js">/**/</script>
Expand Down Expand Up @@ -132,25 +132,25 @@
</ul>
</nav>
<div id="main-contents">
<h1>assumeUnshared - multiple declarations</h1>
<h1>assumeThreadLocal - multiple declarations</h1>
<nav class="page-nav">
<ul>
<li>
<a href="#0">
Function <code>assumeUnshared</code>
Function <code>assumeThreadLocal</code>
</a>
</li>
<li>
<a href="#1">
Function <code>assumeUnshared</code>
Function <code>assumeThreadLocal</code>
</a>
</li>
</ul>
</nav><h2 id="0">Function assumeUnshared</h2><p></p>
</nav><h2 id="0">Function assumeThreadLocal</h2><p></p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">auto ref </span><span class="pln">T</span> <span class="pln">assumeUnshared</span>(T)
<span class="kwd">auto ref </span><span class="pln">T</span> <span class="pln">assumeThreadLocal</span>(T)
<span class="pun">(</span>
<br/>
&nbsp;&nbsp;<span class="kwd">auto ref </span><span class="pln">T</span> <span class="pln">obj</span>
Expand All @@ -162,11 +162,11 @@ <h1>assumeUnshared - multiple declarations</h1>
</code>
</div>

<h2 id="1">Function assumeUnshared</h2><p></p>
<h2 id="1">Function assumeThreadLocal</h2><p></p>
<div class="prototype">
<code class="lang-d">
<div class="single-prototype">
<span class="kwd">auto ref </span><span class="pln">T</span> <span class="pln">assumeUnshared</span>(T)
<span class="kwd">auto ref </span><span class="pln">T</span> <span class="pln">assumeThreadLocal</span>(T)
<span class="pun">(</span>
<br/>
&nbsp;&nbsp;<span class="kwd">auto ref </span><span class="kwd">shared</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span> <span class="pln">obj</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/sitemap.xml
View file
Expand Up @@ -345,8 +345,8 @@
<url><loc>http://127.0.0.1/rx/subject/SubjectObject.unsubscribe.html</loc></url>
<url><loc>http://127.0.0.1/rx/subject/SubjectObject._observer.html</loc></url>
<url><loc>http://127.0.0.1/rx/util.html</loc></url>
<url><loc>http://127.0.0.1/rx/util/assumeUnshared.html</loc></url>
<url><loc>http://127.0.0.1/rx/util/assumeUnshared.html</loc></url>
<url><loc>http://127.0.0.1/rx/util/assumeThreadLocal.html</loc></url>
<url><loc>http://127.0.0.1/rx/util/assumeThreadLocal.html</loc></url>
<url><loc>http://127.0.0.1/rx/util/EventSignal.html</loc></url>
<url><loc>http://127.0.0.1/rx/util/EventSignal.setSignal.html</loc></url>
<url><loc>http://127.0.0.1/rx/util/EventSignal.signal.html</loc></url>
Expand Down
2 changes: 1 addition & 1 deletion docs/symbols.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion source/rx/algorithm/all.d
View file
Expand Up @@ -110,7 +110,7 @@ public:

void dispose()
{
auto cancel = assumeUnshared(exchange(_cancel, null));
auto cancel = assumeThreadLocal(exchange(_cancel, null));
if (cancel !is null)
cancel.dispose();
}
Expand Down
2 changes: 1 addition & 1 deletion source/rx/disposable.d
View file
Expand Up @@ -356,7 +356,7 @@ public:
{
import rx.util;

auto temp = assumeUnshared(exchange(_disposable, cast(shared) DisposedMarker.instance));
auto temp = assumeThreadLocal(exchange(_disposable, cast(shared) DisposedMarker.instance));
if (temp !is null)
temp.dispose();
}
Expand Down

0 comments on commit bafd2d2

Please sign in to comment.