提交 9293a71b 编写于 作者: C chyyuu

deploy: ad28f5f6

上级 ac156ea9
......@@ -4,5 +4,5 @@
</nav>
<nav class="sidebar"><a class="sidebar-logo" href="../../../os/index.html"><div class="logo-container"><img class="rust-logo" src="../../../rust-logo.svg" alt="logo"></div>
</a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In os::syscall::process</a></h2><div id="sidebar-vars" data-name="sys_kill" data-ty="fn" data-relpath=""></div><script defer src="sidebar-items.js"></script></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../../../os/index.html"><img class="rust-logo" src="../../../rust-logo.svg" alt="logo"></a><nav class="sub"><div class="theme-picker hidden"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="22" height="22" alt="Pick another theme!" src="../../../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../../../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../../../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><div class="main-heading">
<h1 class="fqn"><span class="in-band">Function <a href="../../index.html">os</a>::<wbr><a href="../index.html">syscall</a>::<wbr><a href="index.html">process</a>::<wbr><a class="fn" href="#">sys_kill</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../../../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../../../src/os/syscall/process.rs.html#107-123">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn sys_kill(pid: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.usize.html">usize</a>, signal: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.u32.html">u32</a>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.isize.html">isize</a></code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../../../" data-current-crate="os" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.62.0-nightly (1f7fb6413 2022-04-10)" ></div>
<h1 class="fqn"><span class="in-band">Function <a href="../../index.html">os</a>::<wbr><a href="../index.html">syscall</a>::<wbr><a href="index.html">process</a>::<wbr><a class="fn" href="#">sys_kill</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../../../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../../../src/os/syscall/process.rs.html#107-123">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn sys_kill(pid: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.usize.html">usize</a>, signum: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.i32.html">i32</a>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.isize.html">isize</a></code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../../../" data-current-crate="os" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.62.0-nightly (1f7fb6413 2022-04-10)" ></div>
</body></html>
\ No newline at end of file
......@@ -4,5 +4,5 @@
</nav>
<nav class="sidebar"><a class="sidebar-logo" href="../../../os/index.html"><div class="logo-container"><img class="rust-logo" src="../../../rust-logo.svg" alt="logo"></div>
</a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In os::syscall::process</a></h2><div id="sidebar-vars" data-name="sys_sigaction" data-ty="fn" data-relpath=""></div><script defer src="sidebar-items.js"></script></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../../../os/index.html"><img class="rust-logo" src="../../../rust-logo.svg" alt="logo"></a><nav class="sub"><div class="theme-picker hidden"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="22" height="22" alt="Pick another theme!" src="../../../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../../../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../../../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><div class="main-heading">
<h1 class="fqn"><span class="in-band">Function <a href="../../index.html">os</a>::<wbr><a href="../index.html">syscall</a>::<wbr><a href="index.html">process</a>::<wbr><a class="fn" href="#">sys_sigaction</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../../../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../../../src/os/syscall/process.rs.html#162-186">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn sys_sigaction(<br>&nbsp;&nbsp;&nbsp;&nbsp;signum: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.usize.html">usize</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;action: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.pointer.html">*const </a><a class="struct" href="../../task/action/struct.SignalAction.html" title="struct os::task::action::SignalAction">SignalAction</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;old_action: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.pointer.html">*mut </a><a class="struct" href="../../task/action/struct.SignalAction.html" title="struct os::task::action::SignalAction">SignalAction</a><br>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.isize.html">isize</a></code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../../../" data-current-crate="os" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.62.0-nightly (1f7fb6413 2022-04-10)" ></div>
<h1 class="fqn"><span class="in-band">Function <a href="../../index.html">os</a>::<wbr><a href="../index.html">syscall</a>::<wbr><a href="index.html">process</a>::<wbr><a class="fn" href="#">sys_sigaction</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../../../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../../../src/os/syscall/process.rs.html#162-186">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn sys_sigaction(<br>&nbsp;&nbsp;&nbsp;&nbsp;signum: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.i32.html">i32</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;action: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.pointer.html">*const </a><a class="struct" href="../../task/action/struct.SignalAction.html" title="struct os::task::action::SignalAction">SignalAction</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;old_action: <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.pointer.html">*mut </a><a class="struct" href="../../task/action/struct.SignalAction.html" title="struct os::task::action::SignalAction">SignalAction</a><br>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/nightly/core/primitive.isize.html">isize</a></code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../../../" data-current-crate="os" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.62.0-nightly (1f7fb6413 2022-04-10)" ></div>
</body></html>
\ No newline at end of file
此差异已折叠。
......@@ -87,8 +87,8 @@
<span class="ident">SYSCALL_WRITE</span> =&gt; <span class="ident">sys_write</span>(<span class="ident">args</span>[<span class="number">0</span>], <span class="ident">args</span>[<span class="number">1</span>] <span class="kw">as</span> <span class="kw-2">*const</span> <span class="ident">u8</span>, <span class="ident">args</span>[<span class="number">2</span>]),
<span class="ident">SYSCALL_EXIT</span> =&gt; <span class="ident">sys_exit</span>(<span class="ident">args</span>[<span class="number">0</span>] <span class="kw">as</span> <span class="ident">i32</span>),
<span class="ident">SYSCALL_YIELD</span> =&gt; <span class="ident">sys_yield</span>(),
<span class="ident">SYSCALL_KILL</span> =&gt; <span class="ident">sys_kill</span>(<span class="ident">args</span>[<span class="number">0</span>], <span class="ident">args</span>[<span class="number">1</span>] <span class="kw">as</span> <span class="ident">u32</span>),
<span class="ident">SYSCALL_SIGACTION</span> =&gt; <span class="ident">sys_sigaction</span>(<span class="ident">args</span>[<span class="number">0</span>], <span class="ident">args</span>[<span class="number">1</span>] <span class="kw">as</span> <span class="kw-2">*const</span> <span class="ident">SignalAction</span>, <span class="ident">args</span>[<span class="number">2</span>] <span class="kw">as</span> <span class="kw-2">*mut</span> <span class="ident">SignalAction</span>),
<span class="ident">SYSCALL_KILL</span> =&gt; <span class="ident">sys_kill</span>(<span class="ident">args</span>[<span class="number">0</span>], <span class="ident">args</span>[<span class="number">1</span>] <span class="kw">as</span> <span class="ident">i32</span>),
<span class="ident">SYSCALL_SIGACTION</span> =&gt; <span class="ident">sys_sigaction</span>(<span class="ident">args</span>[<span class="number">0</span>] <span class="kw">as</span> <span class="ident">i32</span>, <span class="ident">args</span>[<span class="number">1</span>] <span class="kw">as</span> <span class="kw-2">*const</span> <span class="ident">SignalAction</span>, <span class="ident">args</span>[<span class="number">2</span>] <span class="kw">as</span> <span class="kw-2">*mut</span> <span class="ident">SignalAction</span>),
<span class="ident">SYSCALL_SIGPROCMASK</span> =&gt; <span class="ident">sys_sigprocmask</span>(<span class="ident">args</span>[<span class="number">0</span>] <span class="kw">as</span> <span class="ident">u32</span>),
<span class="ident">SYSCALL_SIGRETURN</span> =&gt; <span class="ident">sys_sigretrun</span>(),
<span class="ident">SYSCALL_GET_TIME</span> =&gt; <span class="ident">sys_get_time</span>(),
......
......@@ -295,9 +295,9 @@
<span class="comment">// ---- release current PCB automatically</span>
}
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">sys_kill</span>(<span class="ident">pid</span>: <span class="ident">usize</span>, <span class="ident">signal</span>: <span class="ident">u32</span>) -&gt; <span class="ident">isize</span> {
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">sys_kill</span>(<span class="ident">pid</span>: <span class="ident">usize</span>, <span class="ident">signum</span>: <span class="ident">i32</span>) -&gt; <span class="ident">isize</span> {
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">task</span>) <span class="op">=</span> <span class="ident">pid2task</span>(<span class="ident">pid</span>) {
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">flag</span>) <span class="op">=</span> <span class="ident">SignalFlags::from_bits</span>(<span class="ident">signal</span>) {
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">flag</span>) <span class="op">=</span> <span class="ident">SignalFlags::from_bits</span>(<span class="number">1</span> <span class="op">&lt;</span><span class="op">&lt;</span> <span class="ident">signum</span>) {
<span class="comment">// insert the signal if legal</span>
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">task_ref</span> <span class="op">=</span> <span class="ident">task</span>.<span class="ident">inner_exclusive_access</span>();
<span class="kw">if</span> <span class="ident">task_ref</span>.<span class="ident">signals</span>.<span class="ident">contains</span>(<span class="ident">flag</span>) {
......@@ -350,7 +350,7 @@
}
}
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">sys_sigaction</span>(<span class="ident">signum</span>: <span class="ident">usize</span>, <span class="ident">action</span>: <span class="kw-2">*const</span> <span class="ident">SignalAction</span>, <span class="ident">old_action</span>: <span class="kw-2">*mut</span> <span class="ident">SignalAction</span>) -&gt; <span class="ident">isize</span> {
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">sys_sigaction</span>(<span class="ident">signum</span>: <span class="ident">i32</span>, <span class="ident">action</span>: <span class="kw-2">*const</span> <span class="ident">SignalAction</span>, <span class="ident">old_action</span>: <span class="kw-2">*mut</span> <span class="ident">SignalAction</span>) -&gt; <span class="ident">isize</span> {
<span class="kw">let</span> <span class="ident">token</span> <span class="op">=</span> <span class="ident">current_user_token</span>();
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">task</span>) <span class="op">=</span> <span class="ident">current_task</span>() {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">inner</span> <span class="op">=</span> <span class="ident">task</span>.<span class="ident">inner_exclusive_access</span>();
......@@ -361,7 +361,7 @@
<span class="kw">if</span> <span class="ident">check_sigaction_error</span>(<span class="ident">flag</span>, <span class="ident">action</span> <span class="kw">as</span> <span class="ident">usize</span>, <span class="ident">old_action</span> <span class="kw">as</span> <span class="ident">usize</span>) {
<span class="kw">return</span> <span class="op">-</span><span class="number">1</span>;
}
<span class="kw">let</span> <span class="ident">old_kernel_action</span> <span class="op">=</span> <span class="ident">inner</span>.<span class="ident">signal_actions</span>.<span class="ident">table</span>[<span class="ident">signum</span>];
<span class="kw">let</span> <span class="ident">old_kernel_action</span> <span class="op">=</span> <span class="ident">inner</span>.<span class="ident">signal_actions</span>.<span class="ident">table</span>[<span class="ident">signum</span> <span class="kw">as</span> <span class="ident">usize</span>];
<span class="kw">if</span> <span class="ident">old_kernel_action</span>.<span class="ident">mask</span> <span class="op">!</span><span class="op">=</span> <span class="ident">SignalFlags::from_bits</span>(<span class="number">40</span>).<span class="ident">unwrap</span>() {
<span class="kw-2">*</span><span class="ident">translated_refmut</span>(<span class="ident">token</span>, <span class="ident">old_action</span>) <span class="op">=</span> <span class="ident">old_kernel_action</span>;
} <span class="kw">else</span> {
......@@ -369,7 +369,7 @@
<span class="ident">ref_old_action</span>.<span class="ident">handler</span> <span class="op">=</span> <span class="ident">old_kernel_action</span>.<span class="ident">handler</span>;
}
<span class="kw">let</span> <span class="ident">ref_action</span> <span class="op">=</span> <span class="ident">translated_ref</span>(<span class="ident">token</span>, <span class="ident">action</span>);
<span class="ident">inner</span>.<span class="ident">signal_actions</span>.<span class="ident">table</span>[<span class="ident">signum</span>] <span class="op">=</span> <span class="kw-2">*</span><span class="ident">ref_action</span>;
<span class="ident">inner</span>.<span class="ident">signal_actions</span>.<span class="ident">table</span>[<span class="ident">signum</span> <span class="kw">as</span> <span class="ident">usize</span>] <span class="op">=</span> <span class="kw-2">*</span><span class="ident">ref_action</span>;
<span class="kw">return</span> <span class="number">0</span>;
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册