Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn #64129

Merged
merged 5 commits into from
Sep 11, 2019

Conversation

BaoshanPang
Copy link
Contributor

vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn

r? @alexcrichton
cc @n-salim

BaoshanPang and others added 3 commits September 1, 2019 17:52
vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 3, 2019
@@ -1,10 +1,13 @@
// Copyright (c) 2019 Wind River Systems, Inc.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

License?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intent is "the usual Rust license", i.e. Wind River is not claiming any proprietary rights here. But I'm not a lawyer, let me check with someone who can give a better answer and get back to you.

@alexcrichton
Copy link
Member

Looks good to me, thanks @BaoshanPang!

Sorry I wasn't super vigilant earlier about this, so src/libstd/sys/vxworks/fast_thread_local.rs already has this license header as well, but we would ideally prefer to avoid these license headers if possible. We recently had a long discussion on a separate thread about this as well. If you can remove the license headers that would be great, can you check if you can do that? If you cannot, we will need to consult some lawyers most likely about this and it may take a significant amount of time to land this.

@n-salim
Copy link
Contributor

n-salim commented Sep 4, 2019

@alexcrichton Thanks for the feedback. I've asked our IP expert whether we can remove these copyright notices for submissions to the Rust project, and will get back to you with an answer ASAP.

@n-salim
Copy link
Contributor

n-salim commented Sep 5, 2019

@alexcrichton

First, let's distinguish between the copyright notice, e.g:

// Copyright 2019, The Rust Project Developers.

and the license, e.g.:

// Licensed under the Apache License, Version 2.0

Bearing that distinction in mind, here's the feedback from our IP expert (who oversees Wind River contributions to a number of open source projects).

He made the following very good point:

GCC, LLVM, The Linux Kernel as a matter of policy - all require a license notice each file – for a very good reason. If a file does not include a licensing information, it is not open source. That is, one is not granted the rights to copy, modified or distribute the file. The number one threat to open source movement is the lack of clear licensing information in a file. A single license.txt file at the top of a project directory is NO guarantee that each file in the subdirectories (or even the same directory) is under the same terms.

and requested the following:

Can we request the following notice for WR created files. Note the code will be copyright WR regardless of whether or not we include the notice.

// Copyright 2019, The Rust Project Developers.
// Copyright 2019, Wind River Systems
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option.

Are you ok with this wording? The license text above makes it explicit that this file follows the standard Rust licensing policy.

Note that there are a number of existing files in the Rust project that also include explicit 3rd party copyright notices, e.g.:

https://github.com/rust-lang/rust/blob/master/src/libstd/sys/unix/memchr.rs
https://github.com/rust-lang/rust/blob/master/src/libserialize/json.rs

In addition the existing Rust Copyright policy (https://github.com/rust-lang/rust/blob/master/COPYRIGHT) policy appears to cover and allow this standard case:

Copyrights in the Rust project are retained by their contributors. No
copyright assignment is required to contribute to the Rust project.

Some files include explicit copyright notices and/or license notices.
For full authorship information, see the version control history or
https://thanks.rust-lang.org

Except as otherwise noted (below and/or in individual files), Rust is
licensed under the Apache License, Version 2.0 or
http://www.apache.org/licenses/LICENSE-2.0 or the MIT license
or http://opensource.org/licenses/MIT, at your option.

@alexcrichton
Copy link
Member

I do not personally have thoughts on this, I will forward this to others who can take care of this.

@alexcrichton
Copy link
Member

Ok, I'm going to transfer review to...

r? @skade

@n-salim
Copy link
Contributor

n-salim commented Sep 10, 2019

@alexcrichton

We've really appreciated the rapid pace at our contributions have been reviewed and accepted up to now, and want to avoid introducing any road blocks.

With the agreement of our IP guy, we've decided to split this into two PRs, one for the "content", and another for the proposed copyright notice.

(1) We'll remove the Wind River copyright notices from this PR, as well as src/libstd/sys/vxworks/fast_thread_local.rs and any other existing affected files. Hopefully that will allow this PR to get back on track.

(2) We'll create a separate PR to propose copyright/license notices for a few of the WR added files that we think need them. Any discussion around such notices can occur in that PR, without any pressure to "hurry".

Sound good?

@alexcrichton
Copy link
Member

@n-salim sounds like a good plan to me!

@skade
Copy link
Contributor

skade commented Sep 10, 2019

@n-salim Also sounds great from me, please ping me on the next PR and I'm pretty sure we will get that through quickly!

@BaoshanPang
Copy link
Contributor Author

Hi All,

The Wind River copyritht notices have been removed.

Thanks,
Baoshan

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 10, 2019

📌 Commit 665291c has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 10, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 10, 2019
vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn

vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn

r? @alexcrichton
cc @n-salim
bors added a commit that referenced this pull request Sep 10, 2019
Rollup of 6 pull requests

Successful merges:

 - #64060 (Improve hygiene of `alloc::format!`)
 - #64072 (Replace file_stem by file_name in rustdoc markdown)
 - #64085 (Tweak unsatisfied HRTB errors)
 - #64129 (vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn)
 - #64188 (rustc: Allow the cdylib crate type with wasm32-wasi)
 - #64349 (documentation for AtomicPtr CAS operations)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 11, 2019
vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn

vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn

r? @alexcrichton
cc @n-salim
bors added a commit that referenced this pull request Sep 11, 2019
Rollup of 6 pull requests

Successful merges:

 - #64060 (Improve hygiene of `alloc::format!`)
 - #64072 (Replace file_stem by file_name in rustdoc markdown)
 - #64129 (vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn)
 - #64188 (rustc: Allow the cdylib crate type with wasm32-wasi)
 - #64326 (Fixed documentation within c_str::from_ptr)
 - #64349 (documentation for AtomicPtr CAS operations)

Failed merges:

r? @ghost
@bors bors merged commit 665291c into rust-lang:master Sep 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants