Skip to content

Do not rebuild logging function if gecko-in-tree #128

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

Closed
mutexlox-signal wants to merge 2 commits into from
Closed

Do not rebuild logging function if gecko-in-tree #128

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
3678252
Do not rebuild logging function if gecko-in-tree
mutexlox-signal Sep 16, 2025
1910596
Fix nightly clippy finding.
mutexlox-signal Sep 16, 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
2 changes: 1 addition & 1 deletion cubeb-backend/src/capi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ pub unsafe extern "C" fn capi_device_collection_destroy<CTX: ContextOps>(
let ctx = &mut *(c as *mut CTX);
let collection = &mut *(collection);

let coll = Box::from_raw(std::slice::from_raw_parts_mut(
let coll = Box::from_raw(std::ptr::slice_from_raw_parts_mut(
collection.device as *mut DeviceInfo,
collection.count,
));
Expand Down
10 changes: 9 additions & 1 deletion cubeb-core/src/log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
// This program is made available under an ISC-style license. See the
// accompanying file LICENSE for details.

use ffi;
#[cfg(not(feature = "gecko-in-tree"))]
use std::ffi::{c_char, CStr};
#[cfg(not(feature = "gecko-in-tree"))]
use std::sync::RwLock;
use {ffi, Error, Result};
#[cfg(not(feature = "gecko-in-tree"))]
use {Error, Result};

/// Level (verbosity) of logging for a particular cubeb context.
#[derive(PartialEq, Eq, Clone, Debug, Copy, PartialOrd, Ord)]
Expand Down Expand Up @@ -44,8 +48,10 @@ pub fn log_enabled() -> bool {
unsafe { ffi::cubeb_log_get_level() != LogLevel::Disabled as _ }
}

#[cfg(not(feature = "gecko-in-tree"))]
static LOG_CALLBACK: RwLock<Option<fn(s: &CStr)>> = RwLock::new(None);

#[cfg(not(feature = "gecko-in-tree"))]
extern "C" {
fn cubeb_write_log(fmt: *const c_char, ...);
}
Expand All @@ -54,6 +60,7 @@ extern "C" {
///
/// |s| must be null, or a pointer to a valid, nul-terminated, array of chars.
#[no_mangle]
#[cfg(not(feature = "gecko-in-tree"))]
pub unsafe extern "C" fn rust_write_formatted_msg(s: *const c_char) {
if s.is_null() {
// Do nothing if the pointer is null.
Expand All @@ -68,6 +75,7 @@ pub unsafe extern "C" fn rust_write_formatted_msg(s: *const c_char) {
// Silently fail if lock cannot be acquired.
}

#[cfg(not(feature = "gecko-in-tree"))]
pub fn set_logging(level: LogLevel, f: Option<fn(s: &CStr)>) -> Result<()> {
match LOG_CALLBACK.write() {
Ok(mut guard) => {
Expand Down