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.

Sign up for GitHub

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

Jump to bottom

[WIP] OSX support #377

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

[WIP] OSX support #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
989db8f
[skc] Store sklib sources in `lib.skmeta`.
beauby Oct 7, 2024
7f77b6f
[runtime] Fix mutex locking when using in-memory persistent heap.
beauby Aug 19, 2024
47e566d
[prelude] Fix memory initialization on OSX.
beauby Oct 4, 2024
6bfb98e
[skc] Fix stale analysis invalidation.
beauby Oct 8, 2024
3f6b32e
[skc] Merge `fileTimeDir` into `allFilesDir`.
beauby Oct 8, 2024
43baeed
[stdlib] Fix error message for JSON `KeyNotFound` exception.
beauby Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified skiplang/compiler/bootstrap/skargo_out64.ll.gz
View file
Open in desktop
Binary file not shown.
Binary file modified skiplang/compiler/bootstrap/skc_out64.ll.gz
View file
Open in desktop
Binary file not shown.
Binary file modified skiplang/compiler/bootstrap/skfmt_out64.ll.gz
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion skiplang/compiler/src/compile.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ fun getOrInitializeBackend(
};

_ = context.mkdir(x ~> x, x ~> x, FileCache.fileDirName);
_ = context.mkdir(x ~> x, x ~> x, FileCache.fileTimeDirName);
_ = context.mkdir(x ~> x, x ~> x, FileCache.allFilesDirName);
backendDir = context.mkdir(
SKStore.IID::keyType,
Expand Down
239 changes: 116 additions & 123 deletions skiplang/compiler/src/skipParse.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,160 +22,153 @@ const fileDir: SKStore.EHandle<
fileDirName,
);

class InputPackage(
name: ?String,
srcs: Array<(String, Int)>,
) extends SKStore.File

// Contains the paths of all source files the analysis of which has
// been kept so far.
const allFilesDirName: SKStore.DirName = SKStore.DirName::create(
"/allFilesCache/",
);
const allFilesDir: SKStore.EHandle<
SKStore.IID,
SKStore.StringFile,
> = SKStore.EHandle(
const allFilesDir: SKStore.EHandle<SKStore.IID, InputPackage> = SKStore.EHandle(
SKStore.IID::keyType,
SKStore.StringFile::type,
InputPackage::type,
allFilesDirName,
);

const fileTimeDirName: SKStore.DirName = SKStore.DirName::create(
"/fileTimeCache/",
);
const fileTimeDir: SKStore.EHandle<
SKStore.SID,
SKStore.IntFile,
> = SKStore.EHandle(
SKStore.SID::keyType,
SKStore.IntFile::type,
fileTimeDirName,
);
fun pkgDelta(
old_srcs: Array<(String, Int)>,
new_srcs: Array<(String, Int)>,
): (Array<String>, Array<String>, Array<String>) {
added_files = mutable Vector[];
modified_files = mutable Vector[];
deleted_files = mutable Vector[];

// FIXME: This is O(n^2).
Copy link
Contributor

Choose a reason for hiding this comment

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

Are the srcs arrays already sorted? A linear traversal of new_srcs seems unavoidable. So perhaps the best that can be done is to sort old_srcs and use a binary search instead of Array.find. Maybe it would be better to also sort new_srcs and then be able to narrow the binary search of old_srcs at each step.

for ((src, mtime) in new_srcs) {
old_srcs.find(s -> s.i0 == src) match {
| Some((_, old_mtime)) ->
if (mtime != old_mtime) {
modified_files.push(src)
}
| None() -> added_files.push(src)
}
};

fun get_old_files_per_package(
context: mutable SKStore.Context,
): Map<String, SortedSet<String>> {
allFilesDir
.unsafeGetArray(context, SKStore.IID(0))
.reduce(
(map, fn) -> {
key = fn.value;
(package, filename) = if (key.contains(":")) {
key.splitFirst(":")
} else {
("", key)
};
map.getOrAdd(package, () -> mutable Vector[]).push(filename);
map
},
mutable Map[],
)
.map((_, v) -> SortedSet::createFromItems(v))
.chill()
}
// FIXME: This is O(n^2).
for ((src, _) in old_srcs) {
if (!new_srcs.any(s -> s.i0 == src)) {
deleted_files.push(src)
}
};

fun writeFile(
context: mutable SKStore.Context,
key: String,
last_modif_time: Int,
contents: String,
): void {
fileTimeDir.writeArray(
context,
SKStore.SID(key),
Array[SKStore.IntFile(last_modif_time)],
);
fileDir.writeArray(
context,
SKStore.SID(key),
Array[SKStore.StringFile(contents)],
(
added_files.collect(Array),
modified_files.collect(Array),
deleted_files.collect(Array),
)
}

fun formatPkgSrc(pkg_opt: ?String, path: String): String {
pkg_opt.map(p -> `${p}:`).default("") + path
}

fun writeFiles(
context: mutable SKStore.Context,
file_names: Array<String>,
dependencies: Map<String, (String, Sklib.Metadata)>,
lib_name_opt: ?String,
): void {
old_files_per_package = get_old_files_per_package(context);

stale_files = Vector::mcreateFromItems(
lib_name_opt match {
| Some(lib_name) ->
old_files_per_package
.maybeGet(lib_name)
.default(SortedSet[])
.difference(SortedSet::createFromItems(file_names))
.union(old_files_per_package.maybeGet("").default(SortedSet[]))
.map(fn -> `${lib_name}:${fn}`)
.collect(Array)
| None() ->
old_files_per_package
.maybeGet("")
.default(SortedSet[])
.difference(SortedSet::createFromItems(file_names))
.collect(Array)
},
);
current_files = Vector::mcreateFromItems(
lib_name_opt match {
| Some(lib_name) -> file_names.map(fn -> `${lib_name}:${fn}`)
| None() -> file_names
},
);
// Files in the current graph.
current_files = mutable Map[
lib_name_opt => file_names
.map(fn ->
(
fn,
FileSystem.getLastModificationTime(fn),
FileSystem.readTextFile(fn),
)
)
.collect(Array),
];
for (dep_name => dep in dependencies) {
(_, dep_meta) = dep;
current_files.set(Some(dep_name), dep_meta.sources)
};

for (file_name in file_names) {
key = lib_name_opt match {
| Some(lib_name) -> `${lib_name}:${file_name}`
| None() -> file_name
};
lastModifTime = FileSystem.getLastModificationTime(file_name);
timeArr = fileTimeDir.unsafeGetArray(context, SKStore.SID(key));
if (timeArr.size() > 0 && timeArr[0].value == lastModifTime) continue;
contents = FileSystem.readTextFile(file_name);
writeFile(context, key, lastModifTime, contents)
// Files kept in the previous run.
old_files = mutable Map[];
for (pkg in allFilesDir.unsafeGetArray(context, SKStore.IID(0))) {
old_files.set(pkg.name, pkg.srcs)
};

for (lib_name => dep in dependencies) {
(lib_path, _) = dep;
file = IO.File::open(lib_path, IO.OpenOptions{read => true});
lib = Sklib::read(file) match {
| Success(lib) -> lib
| Failure(err) ->
print_error(`Could not read ${lib_path}: ${err}`);
skipExit(3)
stale_pkgs = mutable Vector<?String>[];
if (lib_name_opt is Some _) {
// Invalidate non-package source files.
stale_pkgs.push(None())
};
// For each current package, invalidate files that were modified or deleted.
for (pkg_opt => srcs in current_files) {
(added_files, modified_files, deleted_files) = if (
old_files.containsKey(pkg_opt)
) {
pkgDelta(old_files[pkg_opt], srcs.map(src -> (src.i0, src.i1)));
} else {
(srcs.map(src -> src.i0), Array[], Array[])
};

for (f in old_files_per_package
.maybeGet(lib_name)
.default(SortedSet[])
.difference(SortedSet::createFromIterator(lib.sources.keys()))) {
stale_files.push(`${lib_name}:${f}`)
if (
added_files.isEmpty() &&
modified_files.isEmpty() &&
deleted_files.isEmpty()
) {
continue
};

for (src_path => header in lib.sources) {
key = `${lib_name}:${src_path}`;
current_files.push(key);

lastModifTime = header.mtime;
timeArr = fileTimeDir.unsafeGetArray(context, SKStore.SID(key));
if (timeArr.size() > 0 && timeArr[0].value == lastModifTime) continue;
contents = lib.read_file(src_path) match {
| Success(v) -> v
| Failure(err) ->
print_error(`Could not read ${src_path} from ${lib_path} (${err})`);
skipExit(3)
};
writeFile(context, key, lastModifTime, contents)
stale_pkgs.push(pkg_opt);

// Update added/modified files.
for (src_path in added_files.concat(modified_files)) {
key = formatPkgSrc(pkg_opt, src_path);
// FIXME: This is O(n).
src_contents = srcs.find(src ~> src.i0 == src_path).fromSome().i2;
fileDir.writeArray(
context,
SKStore.SID(key),
Array[SKStore.StringFile(src_contents)],
)
};

file.close();
// Invalidate deleted files.
for (src_path in deleted_files) {
key = formatPkgSrc(pkg_opt, src_path);
fileDir.writeArray(
context,
SKStore.SID(key),
Array[SKStore.StringFile("")],
)
}
};

for (file_name in stale_files) {
key = SKStore.SID(file_name);
fileDir.writeArray(context, key, Array[SKStore.StringFile("")]);
fileTimeDir.writeArray(context, key, Array[])
new_old_files = current_files
.map((_, srcs) -> srcs.map(src -> (src.i0, src.i1)))
.clone();
// Keep analysis for all non-stale packages.
for (pkg_opt => srcs in old_files) {
// FIXME: This is O(n).
if (stale_pkgs.contains(pkg_opt)) {
continue
};
new_old_files.set(pkg_opt, srcs)
};

allFilesDir.writeArray(
context,
SKStore.IID(0),
current_files.map(x -> SKStore.StringFile(x)).collect(Array),
new_old_files
.items()
.map(pkg -> InputPackage(pkg.i0, pkg.i1))
.collect(Array),
);
}

Expand Down
Loading