<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Kouhei Sutou <kou****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2017-04-04 17:18:58 +0900 (Tue, 04 Apr 2017)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52">d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">cache: use lock timeout for cache</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757">lib/cache.c</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: lib/cache.c (+3 -3)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L414">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L415">415</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L416">416</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L417">417</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L418">418</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L419">419</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L420">420</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L421">421</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L534">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L535">535</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L536">536</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L537">537</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L538">538</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L539">539</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L540">540</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L541">541</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L606">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L607">607</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L608">608</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L609">609</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L610">610</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L611">611</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L612">612</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757L613">613</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R414">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R415">415</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R416">416</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R417">417</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R418">418</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R419">419</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R420">420</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R421">421</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R534">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R535">535</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R536">536</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R537">537</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R538">538</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R539">539</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R540">540</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R541">541</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R606">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R607">607</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R608">608</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R609">609</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R610">610</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R611">611</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R612">612</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/d4fb073ba11f18fb5e3b957b65fd7d05b29d1e52#diff-77dc4b01de73d3c8e529de2216371757R613">613</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -415,7 +415,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_cache_fetch_persistent(grn_ctx *ctx, grn_cache *cache,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return rc;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- rc = grn_io_lock(ctx, keys->io, <span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">g</span>rn<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">_lock_</span>timeout);</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ rc = grn_io_lock(ctx, keys->io, <span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">cache->impl.pe</span>r<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">siste</span>n<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">t.</span>timeout);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (rc != GRN_SUCCESS) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return rc;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -535,7 +535,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_cache_update_persistent(grn_ctx *ctx, grn_cache *cache,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- rc = grn_io_lock(ctx, keys->io, <span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">g</span>rn<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">_lock_</span>timeout);</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ rc = grn_io_lock(ctx, keys->io, <span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">cache->impl.pe</span>r<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">siste</span>n<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">t.</span>timeout);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (rc != GRN_SUCCESS) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -607,7 +607,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_cache_expire_persistent(grn_cache *cache, int32_t size)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_hash *keys = cache->impl.persistent.keys;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_cache_entry_persistent *head_entry;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- rc = grn_io_lock(ctx, keys->io, <span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">g</span>rn<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">_lock_</span>timeout);</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ rc = grn_io_lock(ctx, keys->io, <span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">cache->impl.pe</span>r<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">siste</span>n<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">t.</span>timeout);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (rc != GRN_SUCCESS) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>