Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use atomic pointers instead of static mut for DOM proxy handlers

Browse source
This commit is contained in:
Simon Sapin 2020-06-05 00:10:14 +02:00
parent 3367db6067
commit 57d89675b0
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2750,7 +2750,9 @@ class CGWrapMethod(CGAbstractMethod):
unforgeable = CopyUnforgeablePropertiesToInstance(self.descriptor) unforgeable = CopyUnforgeablePropertiesToInstance(self.descriptor)
if self.descriptor.proxy: if self.descriptor.proxy:
create = """ create = """
let handler = RegisterBindings::proxy_handlers::%(concreteType)s; let handler: *const libc::c_void =
RegisterBindings::proxy_handlers::%(concreteType)s
.load(std::sync::atomic::Ordering::Acquire);
rooted!(in(*cx) let obj = NewProxyObject( rooted!(in(*cx) let obj = NewProxyObject(
*cx, *cx,
handler, handler,
@ -6744,7 +6746,10 @@ class CGRegisterProxyHandlersMethod(CGAbstractMethod):
def definition_body(self): def definition_body(self):
return CGList([ return CGList([
CGGeneric("proxy_handlers::%s = Bindings::%s::DefineProxyHandler();" CGGeneric("proxy_handlers::%s.store(\n"
" Bindings::%s::DefineProxyHandler() as *mut _,\n"
" std::sync::atomic::Ordering::Release,\n"
");"
% (desc.name, '::'.join([desc.name + 'Binding'] * 2))) % (desc.name, '::'.join([desc.name + 'Binding'] * 2)))
for desc in self.descriptors for desc in self.descriptors
], "\n") ], "\n")
@ -6758,7 +6763,8 @@ class CGRegisterProxyHandlers(CGThing):
"#[allow(non_upper_case_globals)]\n" + "#[allow(non_upper_case_globals)]\n" +
"pub mod proxy_handlers {\n" + "pub mod proxy_handlers {\n" +
"".join( "".join(
" pub static mut %s: *const libc::c_void = std::ptr::null();\n" " pub static %s: std::sync::atomic::AtomicPtr<libc::c_void> =\n"
" std::sync::atomic::AtomicPtr::new(std::ptr::null_mut());\n"
% desc.name % desc.name
for desc in descriptors for desc in descriptors
) + ) +