<!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">2015-10-16 16:28:56 +0900 (Fri, 16 Oct 2015)</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/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a">2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a</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">Add missing lock</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/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022">lib/conf.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/conf.c (+12 -1)</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/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022L59">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022L60">60</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022L61">61</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022L62">62</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022L63">63</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </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/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022L64">64</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022L65">65</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022L66">66</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/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R59">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R60">60</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R61">61</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R62">62</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R63">63</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R64">64</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R65">65</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R66">66</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R67">67</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R68">68</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R69">69</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R70">70</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R71">71</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R72">72</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R73">73</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R74">74</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R75">75</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R76">76</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2cf68dedd59930fe93cbda60a6b9a7fa7c05e93a#diff-cbbb49929ca204cb1ff0af63b80b3022R77">77</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">@@ -60,7 +60,18 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_conf_set(grn_ctx *ctx,</span></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-not-changed" style="display: block; white-space: pre"> conf = ((grn_db *)db)->conf;</span>
<span class="diff-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre">- id = grn_hash_add(ctx, conf, key, key_size, &packed_value, NULL);</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ {</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ grn_rc rc;</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ rc = grn_io_lock(ctx, conf->io, grn_lock_timeout);</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ if (rc != GRN_SUCCESS) {</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ if (ctx->rc == GRN_SUCCESS) {</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ ERR(rc, "[conf][set] failed to lock");</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ GRN_API_RETURN(rc);</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ id = grn_hash_add(ctx, conf, key, key_size, &packed_value, NULL);</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ grn_io_unlock(conf->io);</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (id == GRN_ID_NIL && ctx->rc == GRN_SUCCESS) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ERR(GRN_INVALID_ARGUMENT,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "[conf][set] failed to set: name=<%.*s>: <%d>",</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>