-
-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix compilation unit name conflicts with runtime sub-libraries.
The libraries in subdirectories under `riot/runtime` have been merged into `runtime` itself. In various places we now need to refer to (e.g.) `Runtime.Core` instead of `Core` directly. To avoid name conflicts with the `Runtime` module itself (including via `Lib.Runtime`), I renamed `runtime` to `riot_runtime`. In all, the following compilation unit names have been purged from the global namespace: - Core - Log - Runtime - Scheduler - Time - Util
- Loading branch information
Showing
28 changed files
with
73 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
(library | ||
(name riot) | ||
(public_name riot) | ||
(libraries lib runtime)) | ||
(libraries lib riot_runtime)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
(libraries | ||
global | ||
logger | ||
runtime | ||
riot_runtime | ||
tls | ||
bytestring | ||
telemetry | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
(library | ||
(package riot) | ||
(name global) | ||
(libraries runtime)) | ||
(libraries riot_runtime)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
include Runtime.Import | ||
include Riot_runtime.Import | ||
|
||
(* TODO(@leostera): move these into the Runtime module below *) | ||
include Runtime.Core.Process.Exn | ||
include Runtime.Core.Proc_registry.Exn | ||
include Riot_runtime.Core.Process.Exn | ||
include Riot_runtime.Core.Proc_registry.Exn | ||
|
||
let ( let* ) = Result.bind |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
include Runtime.Util.Dashmap | ||
include Riot_runtime.Util.Dashmap |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
(library | ||
(package riot) | ||
(name logger) | ||
(libraries global runtime)) | ||
(libraries global riot_runtime)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
include Runtime.Core.Message | ||
include Riot_runtime.Core.Message |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
include Runtime.Core.Pid | ||
include Riot_runtime.Core.Pid |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
include Runtime.Util.Lf_queue | ||
include Riot_runtime.Util.Lf_queue |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
include Runtime.Core.Ref | ||
include Riot_runtime.Core.Ref |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
module Core = Core | ||
module Mailbox = Mailbox | ||
module Message = Message | ||
module Pid = Pid | ||
module Proc_effect = Proc_effect | ||
module Proc_queue = Proc_queue | ||
module Proc_registry = Proc_registry | ||
module Proc_set = Proc_set | ||
module Proc_state = Proc_state | ||
module Proc_table = Proc_table | ||
module Process = Process | ||
module Ref = Ref | ||
module Scheduler_uid = Scheduler_uid |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,14 @@ | ||
(library | ||
(package riot) | ||
(name runtime) | ||
(libraries core log scheduler time util rio)) | ||
(name riot_runtime) | ||
(libraries | ||
gluon | ||
mtime | ||
mtime.clock.os | ||
ptime | ||
ptime.clock.os | ||
rio | ||
runtime_events | ||
unix)) | ||
|
||
(include_subdirs unqualified) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
module Timer_wheel = Timer_wheel |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
module Dashmap = Dashmap | ||
module Lf_queue = Lf_queue | ||
module Min_heap = Min_heap | ||
module Thread_local = Thread_local | ||
module Timeout = Timeout | ||
module Trace = Trace | ||
module Uid = Uid | ||
module Util = Util | ||
module Weak_ref = Weak_ref |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters