Skip to content

Commit ae1f7e8

Browse files
authored
Merge pull request swiftlang#140 from dgrove-oss/update-install-readme
update INSTALL.md and README.md
2 parents 1300d06 + 5c17dd6 commit ae1f7e8

File tree

2 files changed

+12
-29
lines changed

2 files changed

+12
-29
lines changed

INSTALL.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ Note that once libdispatch is installed into a Swift toolchain, that
4141
toolchain cannot be used to compile libdispatch again (you must 'make uninstall'
4242
libdispatch from the toolchain before using it to rebuild libdispatch).
4343

44-
To create the toolchain with libdispatch Using build-toolchain in Linux:
44+
You can also use the build-toolchain script to create a toolchain
45+
that includes libdispatch on Linux:
4546

4647
1. Add libdispatch and install-libdispatch lines to ./swift/utils/build-presets.ini under `[preset: buildbot_linux]` section, as following:
4748

@@ -151,15 +152,8 @@ on Ubuntu; currently supported versions are 14.04, 15.10 and 16.04.
151152
152153
1. The first thing to do is install required packages:
153154
154-
1a. Install build tools and clang compiler.
155-
`sudo apt-get install autoconf libtool pkg-config clang`
155+
`sudo apt-get install autoconf libtool pkg-config clang systemtap-sdt-dev libbsd-dev`
156156
157-
1b. Install dtrace (to generate provider.h)
158-
`sudo apt-get install systemtap-sdt-dev`
159-
160-
1c. Install additional libdispatch dependencies
161-
`sudo apt-get install libblocksruntime-dev libkqueue-dev libbsd-dev`
162-
163157
Note: compiling libdispatch requires clang 3.8 or better and
164158
the gold linker. If the default clang on your Ubuntu version is
165159
too old, see http://apt.llvm.org/ to install a newer version.

README.md

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,16 @@ Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for c
44

55
libdispatch is currently available on all Darwin platforms. This project aims to make a modern version of libdispatch available on all other Swift platforms. To do this, we will implement as much of the portable subset of the API as possible, using the existing open source C implementation.
66

7-
## Project Goals
8-
9-
We are currently very early in the development of this project. Our starting point is simply a mirror of the open source drop that corresponds with OS X El Capitan (10.11). Therefore, our earliest goals are:
10-
11-
0. Build and test the C source code as a dynamic library on the current Swift Linux targets (Ubuntu 14.04 and Ubuntu 15.10).
12-
0. Add a `module.modulemap` and make the libdispatch API importable into Swift.
13-
0. After the previous two steps are done, consider possible improvements to the interface of the libdispatch API in Swift.
14-
15-
## Building a C Library
7+
libdispatch on Darwin is a combination of logic in the `xnu` kernel alongside the user-space Library. The kernel has the most information available to balance workload across the entire system. As a first step, however, we believe it is useful to bring up the basic functionality of the library using user-space pthread primitives on Linux. Eventually, a Linux kernel module could be developed to support more informed thread scheduling.
168

17-
libdispatch on Darwin is a combination of logic in the `xnu` kernel alongside the user-space Library. The kernel has the most information available to balance workload across the entire system. As a first step, however, we believe it is useful to bring up the basic functionality of the library using user-space pthread primitives on Linux.
18-
19-
Our first tasks for this project are:
20-
21-
1. Adapt the current autotools build system to work on Linux, or develop a new makefile or other build script for the project on Linux. The current version of the build system has only been tested on Darwin, though previous versions have been made to work on FreeBSD and Linux (see [INSTALL](INSTALL.md)).
22-
2. Omit as much of the extra functionality of the library as possible, to get a core version of the project building. Much of the OS X-specific functionality can be elided completely on Linux.
23-
3. Adopt libdispatch in other Core Libraries projects, especially Foundation. This will validate our work and get immediate coverage on basic functionality.
24-
4. Incrementally add functionality back in.
9+
## Project Goals
2510

26-
Some C headers and sources (e.g. `Availability.h`, `Block.h`, and the libclosure `runtime.c`) are similar to ones embedded into the CoreFoundation part of [swift-corelibs-foundation](http://github.com/apple/swift-corelibs-foundation). We should figure out a mechanism to share these instead of duplicating them across projects.
11+
We are currently early in the development of this project. We began with a mirror of the open source drop that corresponds with OS X El Capitan (10.11) and have ported it to x86_64 Ubuntu 14.04 and 15.10. The next steps are:
12+
1. Complete the work to adopt libdispatch in other Core Libraries projects, especially Foundation. This will validate our work and get immediate test coverage on basic functionality of the Swift API.
13+
2. Include libdispatch and libdispatch-enabled Core Libraries in the Swift CI environment and the pre-built Swift toolchains at Swift.org.
14+
4. Develop a test suite for the Swift APIs of libdispatch.
15+
4. Enhance libdispatch as needed to support Swift language evolution and the needs of the other Core Libraries projects.
2716

28-
## See also
17+
## Build and Install
2918

30-
[INSTALL](INSTALL.md)
19+
For detailed instructions on building and installing libdispatch, see [INSTALL.md](INSTALL.md)

0 commit comments

Comments
 (0)