<!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">2013-06-05 18:37:26 +0900 (Wed, 05 Jun 2013)</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/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3">27f5e4b6bfa0d5e8bc869600a86ee439edb951a3</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 locks for registering/unregistering I/O</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/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#diff-0">lib/io.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/io.c (+12 -2)</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/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L154">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L155">155</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L156">156</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L157">157</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L158">158</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L159">159</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L160">160</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L161">161</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L162">162</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L163">163</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L164">164</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L168">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L169">169</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L170">170</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L171">171</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L172">172</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L173">173</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L174">174</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L175">175</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L176">176</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L177">177</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0L178">178</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/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R154">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R155">155</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R156">156</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R157">157</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R158">158</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R159">159</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R160">160</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R161">161</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R162">162</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R163">163</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R164">164</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R165">165</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R166">166</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R167">167</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R168">168</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R169">169</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R173">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R174">174</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R175">175</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R176">176</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R177">177</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R178">178</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R179">179</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R180">180</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R181">181</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R182">182</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R183">183</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R184">184</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R185">185</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R186">186</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R187">187</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/27f5e4b6bfa0d5e8bc869600a86ee439edb951a3#L0R188">188</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">@@ -155,10 +155,15 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">static void</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_io_register(grn_io *io)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (io->fis && (io->flags & (GRN_IO_EXPIRE_GTICK|GRN_IO_EXPIRE_SEGMENT))) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_bool succeeded = GRN_FALSE;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ CRITICAL_SECTION_ENTER(grn_glock);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (grn_gctx.impl && grn_gctx.impl->ios &&</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_hash_add(&grn_gctx, grn_gctx.impl->ios, io->path, strlen(io->path),</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> (void **)&io, NULL)) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- } else {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ succeeded = GRN_TRUE;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ CRITICAL_SECTION_LEAVE(grn_glock);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!succeeded) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_LOG(&grn_gctx, GRN_LOG_WARNING,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "grn_io_register(%s) failed", io->path);</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">@@ -169,10 +174,15 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">static void</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_io_unregister(grn_io *io)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (io->fis && (io->flags & (GRN_IO_EXPIRE_GTICK|GRN_IO_EXPIRE_SEGMENT))) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_bool succeeded = GRN_FALSE;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ CRITICAL_SECTION_ENTER(grn_glock);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (grn_gctx.impl && grn_gctx.impl->ios) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_hash_delete(&grn_gctx, grn_gctx.impl->ios,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> io->path, strlen(io->path), NULL);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- } else {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ succeeded = GRN_TRUE;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ CRITICAL_SECTION_LEAVE(grn_glock);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!succeeded) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_LOG(&grn_gctx, GRN_LOG_WARNING,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "grn_io_unregister(%s) failed", io->path);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>