Skip to content

C-level optimizations #29

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

Merged
shikokuchuo merged 2 commits into from
Jul 15, 2025
Merged

C-level optimizations #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c1445e
Optimize one double coercion
shikokuchuo Jul 15, 2025
4bf4264
Simplify unreachable error paths
shikokuchuo Jul 15, 2025
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
1 change: 0 additions & 1 deletion R/watch.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ Watcher <- R6Class(
if (!is.null(callback) && !is.function(callback)) {
callback <- rlang::as_function(callback)
}
latency <- as.double(latency)
private$watch <- .Call(watcher_create, private$path, callback, latency)
}
invisible(self)
Expand Down
11 changes: 6 additions & 5 deletions src/watcher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,20 @@ static void session_finalizer(SEXP xptr) {
SEXP watcher_create(SEXP path, SEXP callback, SEXP latency) {

const char *watch_path = Rf_translateChar(STRING_ELT(path, 0));
const double lat = REAL(latency)[0];
const double lat = Rf_asReal(latency);

FSW_HANDLE handle = fsw_init_session(system_default_monitor_type);
if (handle == NULL)
watcher_error(handle, "Watcher failed to allocate memory.");

if (fsw_add_path(handle, watch_path) != FSW_OK)
watcher_error(handle, "Watcher path invalid.");
/* no need to test return value of fsw_add_path() as it only errors if the
* path is a null pointer, and Rf_translateChar() cannot return one
*/
fsw_add_path(handle, watch_path);

if (XLENGTH(path) > 1) {
for (R_xlen_t i = 1; i < XLENGTH(path); i++) {
if (fsw_add_path(handle, Rf_translateChar(STRING_ELT(path, i))) != FSW_OK)
watcher_error(handle, "Watcher path invalid.");
fsw_add_path(handle, Rf_translateChar(STRING_ELT(path, i)));
}
}

Expand Down
Loading