Skip to content

Commit 07418a6

Browse files
committed
---
yaml --- r: 96109 b: refs/heads/dist-snap c: 2337d88 h: refs/heads/master i: 96107: 4700fae v: v3
1 parent 86b476e commit 07418a6

File tree

339 files changed

+2771
-2735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

339 files changed

+2771
-2735
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 90754ae9c95c18841c0200d77da917af5ecde5ee
9+
refs/heads/dist-snap: 2337d88339c10b485d4e121ffabc8d9a89431a82
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,3 @@ config.stamp
8989
src/etc/dl
9090
.settings/
9191
build/
92-
i686-pc-mingw32/

branches/dist-snap/doc/favicon.inc

Lines changed: 0 additions & 1 deletion
This file was deleted.

branches/dist-snap/doc/manual.inc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,4 @@
44
display: block;
55
padding-left: 2em;
66
}
7-
#influences blockquote p:last-child {
8-
display: block;
9-
line-height: 1.428571429;
10-
color: #999999;
11-
}
12-
</style>
7+
</style>

branches/dist-snap/doc/po/ja/tutorial-tasks.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ msgid ""
529529
"The basic example below illustrates this.\n"
530530
"~~~\n"
531531
"# fn make_a_sandwich() {};\n"
532-
"fn fib(n: u64) -> u64 {\n"
532+
"fn fib(n: uint) -> uint {\n"
533533
" // lengthy computation returning an uint\n"
534534
" 12586269025\n"
535535
"}\n"

branches/dist-snap/doc/po/tutorial-tasks.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ msgid ""
529529
"The basic example below illustrates this.\n"
530530
"~~~\n"
531531
"# fn make_a_sandwich() {};\n"
532-
"fn fib(n: u64) -> u64 {\n"
532+
"fn fib(n: uint) -> uint {\n"
533533
" // lengthy computation returning an uint\n"
534534
" 12586269025\n"
535535
"}\n"

branches/dist-snap/doc/rust.css

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright 2013 The Rust Project Developers. See the COPYRIGHT
33
* file at the top-level directory of this distribution and at
44
* http://rust-lang.org/COPYRIGHT.
5-
* With elements taken from Bootstrap v3.0.2 (MIT licensed).
5+
* With elements taken from Bootstrap v3.0.0 (Apache v2.0 licensed).
66
*
77
* Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
88
* http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -93,7 +93,6 @@ p {
9393
a {
9494
text-decoration: none;
9595
color: #428BCA;
96-
background: transparent;
9796
}
9897
a:hover, a:focus {
9998
color: #2A6496;
@@ -115,7 +114,7 @@ h5 a:link, h5 a:visited {color: black;}
115114
/* Code
116115
========================================================================== */
117116
pre, code {
118-
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
117+
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
119118
border-radius: 4px;
120119
}
121120
pre {
@@ -142,7 +141,7 @@ pre code {
142141
color: inherit;
143142
white-space: pre-wrap;
144143
background-color: transparent;
145-
border-radius: 0;
144+
border: 0;
146145
}
147146

148147
/* Code highlighting */
@@ -159,7 +158,7 @@ pre code {
159158
.cm-s-default span.cm-string {color: #a11;}
160159
.cm-s-default span.cm-string-2 {color: #f50;}
161160
.cm-s-default span.cm-meta {color: #555;}
162-
/*.cm-s-default span.cm-error {color: #f00;}*/
161+
.cm-s-default span.cm-error {color: #f00;}
163162
.cm-s-default span.cm-qualifier {color: #555;}
164163
.cm-s-default span.cm-builtin {color: #30a;}
165164
.cm-s-default span.cm-bracket {color: #cc7;}
@@ -188,7 +187,7 @@ pre code {
188187
}
189188
#versioninfo a.hash {
190189
color: gray;
191-
font-size: 70%;
190+
font-size: 60%;
192191
}
193192

194193
blockquote {
@@ -304,4 +303,4 @@ hr {
304303
table td, table th {
305304
background-color: #fff !important;
306305
}
307-
}
306+
}

branches/dist-snap/doc/rustpkg.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Thus, there should be no need to pass a `-L` flag to rustpkg to tell it where to
120120

121121
# Custom build scripts
122122

123-
A file called `pkg.rs` at the root level in a package directory is called a *package script*.
123+
A file called `pkg.rs` at the root level in a workspace is called a *package script*.
124124
If a package script exists, rustpkg executes it to build the package
125125
rather than inferring crates as described previously.
126126

branches/dist-snap/doc/tutorial-conditions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ The `raise` method maps a value of the condition's input type to its output type
351351
The input type should therefore convey all relevant information to the condition handler.
352352
The output type should convey all relevant information _for continuing execution at the site of error_.
353353
When the error site raises a condition handler,
354-
the `Condition::raise` method searches for the innermost installed task-local condition _handler_,
354+
the `Condition::raise` method searches task-local storage (TLS) for the innermost installed _handler_,
355355
and if any such handler is found, calls it with the provided input value.
356356
If no handler is found, `Condition::raise` will fail the task with an appropriate error message.
357357

branches/dist-snap/doc/tutorial-ffi.md

Lines changed: 144 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ extern {
1919
fn snappy_max_compressed_length(source_length: size_t) -> size_t;
2020
}
2121
22+
#[fixed_stack_segment]
2223
fn main() {
2324
let x = unsafe { snappy_max_compressed_length(100) };
24-
println!("max compressed length of a 100 byte buffer: {}", x);
25+
println(fmt!("max compressed length of a 100 byte buffer: %?", x));
2526
}
2627
~~~~
2728

@@ -35,6 +36,11 @@ interfaces that aren't thread-safe, and almost any function that takes a pointer
3536
valid for all possible inputs since the pointer could be dangling, and raw pointers fall outside of
3637
Rust's safe memory model.
3738

39+
Finally, the `#[fixed_stack_segment]` annotation that appears on
40+
`main()` instructs the Rust compiler that when `main()` executes, it
41+
should request a "very large" stack segment. More details on
42+
stack management can be found in the following sections.
43+
3844
When declaring the argument types to a foreign function, the Rust compiler will not check if the
3945
declaration is correct, so specifying it correctly is part of keeping the binding correct at
4046
runtime.
@@ -75,6 +81,8 @@ length is number of elements currently contained, and the capacity is the total
7581
the allocated memory. The length is less than or equal to the capacity.
7682

7783
~~~~ {.xfail-test}
84+
#[fixed_stack_segment]
85+
#[inline(never)]
7886
pub fn validate_compressed_buffer(src: &[u8]) -> bool {
7987
unsafe {
8088
snappy_validate_compressed_buffer(vec::raw::to_ptr(src), src.len() as size_t) == 0
@@ -86,6 +94,36 @@ The `validate_compressed_buffer` wrapper above makes use of an `unsafe` block, b
8694
guarantee that calling it is safe for all inputs by leaving off `unsafe` from the function
8795
signature.
8896

97+
The `validate_compressed_buffer` wrapper is also annotated with two
98+
attributes `#[fixed_stack_segment]` and `#[inline(never)]`. The
99+
purpose of these attributes is to guarantee that there will be
100+
sufficient stack for the C function to execute. This is necessary
101+
because Rust, unlike C, does not assume that the stack is allocated in
102+
one continuous chunk. Instead, we rely on a *segmented stack* scheme,
103+
in which the stack grows and shrinks as necessary. C code, however,
104+
expects one large stack, and so callers of C functions must request a
105+
large stack segment to ensure that the C routine will not run off the
106+
end of the stack.
107+
108+
The compiler includes a lint mode that will report an error if you
109+
call a C function without a `#[fixed_stack_segment]` attribute. More
110+
details on the lint mode are given in a later section.
111+
112+
You may be wondering why we include a `#[inline(never)]` directive.
113+
This directive informs the compiler never to inline this function.
114+
While not strictly necessary, it is usually a good idea to use an
115+
`#[inline(never)]` directive in concert with `#[fixed_stack_segment]`.
116+
The reason is that if a fn annotated with `fixed_stack_segment` is
117+
inlined, then its caller also inherits the `fixed_stack_segment`
118+
annotation. This means that rather than requesting a large stack
119+
segment only for the duration of the call into C, the large stack
120+
segment would be used for the entire duration of the caller. This is
121+
not necessarily *bad* -- it can for example be more efficient,
122+
particularly if `validate_compressed_buffer()` is called multiple
123+
times in a row -- but it does work against the purpose of the
124+
segmented stack scheme, which is to keep stacks small and thus
125+
conserve address space.
126+
89127
The `snappy_compress` and `snappy_uncompress` functions are more complex, since a buffer has to be
90128
allocated to hold the output too.
91129

@@ -96,6 +134,8 @@ the true length after compression for setting the length.
96134

97135
~~~~ {.xfail-test}
98136
pub fn compress(src: &[u8]) -> ~[u8] {
137+
#[fixed_stack_segment]; #[inline(never)];
138+
99139
unsafe {
100140
let srclen = src.len() as size_t;
101141
let psrc = vec::raw::to_ptr(src);
@@ -116,6 +156,8 @@ format and `snappy_uncompressed_length` will retrieve the exact buffer size requ
116156

117157
~~~~ {.xfail-test}
118158
pub fn uncompress(src: &[u8]) -> Option<~[u8]> {
159+
#[fixed_stack_segment]; #[inline(never)];
160+
119161
unsafe {
120162
let srclen = src.len() as size_t;
121163
let psrc = vec::raw::to_ptr(src);
@@ -139,28 +181,98 @@ pub fn uncompress(src: &[u8]) -> Option<~[u8]> {
139181
For reference, the examples used here are also available as an [library on
140182
GitHub](https://github.com/thestinger/rust-snappy).
141183

142-
# Stack management
143-
144-
Rust tasks by default run on a "large stack". This is actually implemented as a
145-
reserving a large segment of the address space and then lazily mapping in pages
146-
as they are needed. When calling an external C function, the code is invoked on
147-
the same stack as the rust stack. This means that there is no extra
148-
stack-switching mechanism in place because it is assumed that the large stack
149-
for the rust task is plenty for the C function to have.
150-
151-
A planned future improvement (net yet implemented at the time of this writing)
152-
is to have a guard page at the end of every rust stack. No rust function will
153-
hit this guard page (due to rust's usage of LLVM's __morestack). The intention
154-
for this unmapped page is to prevent infinite recursion in C from overflowing
155-
onto other rust stacks. If the guard page is hit, then the process will be
156-
terminated with a message saying that the guard page was hit.
157-
158-
For normal external function usage, this all means that there shouldn't be any
159-
need for any extra effort on a user's perspective. The C stack naturally
160-
interleaves with the rust stack, and it's "large enough" for both to
161-
interoperate. If, however, it is determined that a larger stack is necessary,
162-
there are appropriate functions in the task spawning API to control the size of
163-
the stack of the task which is spawned.
184+
# Automatic wrappers
185+
186+
Sometimes writing Rust wrappers can be quite tedious. For example, if
187+
function does not take any pointer arguments, often there is no need
188+
for translating types. In such cases, it is usually still a good idea
189+
to have a Rust wrapper so as to manage the segmented stacks, but you
190+
can take advantage of the (standard) `externfn!` macro to remove some
191+
of the tedium.
192+
193+
In the initial section, we showed an extern block that added a call
194+
to a specific snappy API:
195+
196+
~~~~ {.xfail-test}
197+
use std::libc::size_t;
198+
199+
#[link_args = "-lsnappy"]
200+
extern {
201+
fn snappy_max_compressed_length(source_length: size_t) -> size_t;
202+
}
203+
204+
#[fixed_stack_segment]
205+
fn main() {
206+
let x = unsafe { snappy_max_compressed_length(100) };
207+
println(fmt!("max compressed length of a 100 byte buffer: %?", x));
208+
}
209+
~~~~
210+
211+
To avoid the need to create a wrapper fn for `snappy_max_compressed_length()`,
212+
and also to avoid the need to think about `#[fixed_stack_segment]`, we
213+
could simply use the `externfn!` macro instead, as shown here:
214+
215+
~~~~ {.xfail-test}
216+
use std::libc::size_t;
217+
218+
externfn!(#[link_args = "-lsnappy"]
219+
fn snappy_max_compressed_length(source_length: size_t) -> size_t)
220+
221+
fn main() {
222+
let x = unsafe { snappy_max_compressed_length(100) };
223+
println(fmt!("max compressed length of a 100 byte buffer: %?", x));
224+
}
225+
~~~~
226+
227+
As you can see from the example, `externfn!` replaces the extern block
228+
entirely. After macro expansion, it will create something like this:
229+
230+
~~~~ {.xfail-test}
231+
use std::libc::size_t;
232+
233+
// Automatically generated by
234+
// externfn!(#[link_args = "-lsnappy"]
235+
// fn snappy_max_compressed_length(source_length: size_t) -> size_t)
236+
unsafe fn snappy_max_compressed_length(source_length: size_t) -> size_t {
237+
#[fixed_stack_segment]; #[inline(never)];
238+
return snappy_max_compressed_length(source_length);
239+
240+
#[link_args = "-lsnappy"]
241+
extern {
242+
fn snappy_max_compressed_length(source_length: size_t) -> size_t;
243+
}
244+
}
245+
246+
fn main() {
247+
let x = unsafe { snappy_max_compressed_length(100) };
248+
println(fmt!("max compressed length of a 100 byte buffer: %?", x));
249+
}
250+
~~~~
251+
252+
# Segmented stacks and the linter
253+
254+
By default, whenever you invoke a non-Rust fn, the `cstack` lint will
255+
check that one of the following conditions holds:
256+
257+
1. The call occurs inside of a fn that has been annotated with
258+
`#[fixed_stack_segment]`;
259+
2. The call occurs inside of an `extern fn`;
260+
3. The call occurs within a stack closure created by some other
261+
safe fn.
262+
263+
All of these conditions ensure that you are running on a large stack
264+
segment. However, they are sometimes too strict. If your application
265+
will be making many calls into C, it is often beneficial to promote
266+
the `#[fixed_stack_segment]` attribute higher up the call chain. For
267+
example, the Rust compiler actually labels main itself as requiring a
268+
`#[fixed_stack_segment]`. In such cases, the linter is just an
269+
annoyance, because all C calls that occur from within the Rust
270+
compiler are made on a large stack. Another situation where this
271+
frequently occurs is on a 64-bit architecture, where large stacks are
272+
the default. In cases, you can disable the linter by including a
273+
`#[allow(cstack)]` directive somewhere, which permits violations of
274+
the "cstack" rules given above (you can also use `#[warn(cstack)]` to
275+
convert the errors into warnings, if you prefer).
164276

165277
# Destructors
166278

@@ -184,6 +296,9 @@ pub struct Unique<T> {
184296
185297
impl<T: Send> Unique<T> {
186298
pub fn new(value: T) -> Unique<T> {
299+
#[fixed_stack_segment];
300+
#[inline(never)];
301+
187302
unsafe {
188303
let ptr = malloc(std::mem::size_of::<T>() as size_t) as *mut T;
189304
assert!(!ptr::is_null(ptr));
@@ -207,6 +322,9 @@ impl<T: Send> Unique<T> {
207322
#[unsafe_destructor]
208323
impl<T: Send> Drop for Unique<T> {
209324
fn drop(&mut self) {
325+
#[fixed_stack_segment];
326+
#[inline(never)];
327+
210328
unsafe {
211329
let x = intrinsics::init(); // dummy value to swap in
212330
// moving the object out is needed to call the destructor
@@ -266,8 +384,8 @@ extern {
266384
}
267385
268386
fn main() {
269-
println!("You have readline version {} installed.",
270-
rl_readline_version as int);
387+
println(fmt!("You have readline version %d installed.",
388+
rl_readline_version as int));
271389
}
272390
~~~
273391

@@ -303,7 +421,7 @@ conventions. Rust provides a way to tell the compiler which convention to use:
303421
#[cfg(target_os = "win32", target_arch = "x86")]
304422
#[link_name = "kernel32"]
305423
extern "stdcall" {
306-
fn SetEnvironmentVariableA(n: *u8, v: *u8) -> std::libc::c_int;
424+
fn SetEnvironmentVariableA(n: *u8, v: *u8) -> int;
307425
}
308426
~~~~
309427

branches/dist-snap/doc/tutorial-macros.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@ solves the problem.
210210

211211
# Macro argument pattern matching
212212

213-
## Motivation
214-
215213
Now consider code like the following:
216214

215+
## Motivation
216+
217217
~~~~
218218
# enum t1 { good_1(t2, uint), bad_1 };
219219
# pub struct t2 { body: t3 }

0 commit comments

Comments
 (0)