0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-10-29 08:58:01 -04:00

perf(lsp): better op performance logging (#21423)

This commit is contained in:
Bartek Iwańczuk 2023-12-01 22:57:52 +01:00
parent 950b712dda
commit c5b5400154
No known key found for this signature in database
GPG key ID: 0C6BCDDC3B3AD750
4 changed files with 46 additions and 51 deletions

View file

@ -60,17 +60,11 @@ mod ts {
false
}
#[derive(Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
struct ScriptVersionArgs {
specifier: String,
}
#[op2]
#[string]
fn op_script_version(
_state: &mut OpState,
#[serde] _args: ScriptVersionArgs,
#[string] _arg: &str,
) -> Result<Option<String>, AnyError> {
Ok(Some("1".to_string()))
}

View file

@ -191,7 +191,7 @@ impl Performance {
"type": "measure",
"name": measure.name,
"count": measure.count,
"duration": measure.duration.as_millis() as u32,
"duration": measure.duration.as_micros() as f64 / 1000.0,
})
);
let duration = measure.duration;

View file

@ -47,6 +47,8 @@ use deno_core::serde::Serialize;
use deno_core::serde_json;
use deno_core::serde_json::json;
use deno_core::serde_json::Value;
use deno_core::serde_v8;
use deno_core::v8;
use deno_core::JsRuntime;
use deno_core::ModuleSpecifier;
use deno_core::OpState;
@ -3877,71 +3879,76 @@ struct LoadResponse {
}
#[op2]
#[serde]
fn op_load(
fn op_load<'s>(
scope: &'s mut v8::HandleScope,
state: &mut OpState,
#[serde] args: SpecifierArgs,
) -> Result<Option<LoadResponse>, AnyError> {
) -> Result<v8::Local<'s, v8::Value>, AnyError> {
let state = state.borrow_mut::<State>();
let mark = state.performance.mark("op_load", Some(&args));
let specifier = state.specifier_map.normalize(args.specifier)?;
if specifier.as_str() == "internal:///missing_dependency.d.ts" {
return Ok(Some(LoadResponse {
data: Arc::from("declare const __: any;\nexport = __;\n"),
script_kind: crate::tsc::as_ts_script_kind(MediaType::Dts),
version: Some("1".to_string()),
}));
}
let asset_or_document = state.get_asset_or_document(&specifier);
let maybe_load_response =
if specifier.as_str() == "internal:///missing_dependency.d.ts" {
Some(LoadResponse {
data: Arc::from("declare const __: any;\nexport = __;\n"),
script_kind: crate::tsc::as_ts_script_kind(MediaType::Dts),
version: Some("1".to_string()),
})
} else {
let asset_or_document = state.get_asset_or_document(&specifier);
asset_or_document.map(|doc| LoadResponse {
data: doc.text(),
script_kind: crate::tsc::as_ts_script_kind(doc.media_type()),
version: state.script_version(&specifier),
})
};
let serialized = serde_v8::to_v8(scope, maybe_load_response)?;
state.performance.measure(mark);
Ok(asset_or_document.map(|doc| LoadResponse {
data: doc.text(),
script_kind: crate::tsc::as_ts_script_kind(doc.media_type()),
version: state.script_version(&specifier),
}))
Ok(serialized)
}
#[op2]
#[serde]
fn op_resolve(
fn op_resolve<'s>(
scope: &'s mut v8::HandleScope,
state: &mut OpState,
#[serde] args: ResolveArgs,
) -> Result<Vec<Option<(String, String)>>, AnyError> {
) -> Result<v8::Local<'s, v8::Value>, AnyError> {
let state = state.borrow_mut::<State>();
let mark = state.performance.mark_with_args("tsc.op.op_resolve", &args);
let referrer = state.specifier_map.normalize(&args.base)?;
let result = match state.get_asset_or_document(&referrer) {
let specifiers = match state.get_asset_or_document(&referrer) {
Some(referrer_doc) => {
let resolved = state.state_snapshot.documents.resolve(
args.specifiers,
&referrer_doc,
state.state_snapshot.npm.as_ref(),
);
Ok(
resolved
.into_iter()
.map(|o| {
o.map(|(s, mt)| {
(
state.specifier_map.denormalize(&s),
mt.as_ts_extension().to_string(),
)
})
resolved
.into_iter()
.map(|o| {
o.map(|(s, mt)| {
(
state.specifier_map.denormalize(&s),
mt.as_ts_extension().to_string(),
)
})
.collect(),
)
})
.collect()
}
None => {
lsp_warn!(
"Error resolving. Referring specifier \"{}\" was not found.",
args.base
);
Ok(vec![None; args.specifiers.len()])
vec![None; args.specifiers.len()]
}
};
let response = serde_v8::to_v8(scope, specifiers)?;
state.performance.measure(mark);
result
Ok(response)
}
#[op2]
@ -4002,22 +4009,16 @@ fn op_script_names(state: &mut OpState) -> Vec<String> {
.collect()
}
#[derive(Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
struct ScriptVersionArgs {
specifier: String,
}
#[op2]
#[string]
fn op_script_version(
state: &mut OpState,
#[serde] args: ScriptVersionArgs,
#[string] specifier: &str,
) -> Result<Option<String>, AnyError> {
let state = state.borrow_mut::<State>();
// this op is very "noisy" and measuring its performance is not useful, so we
// don't measure it uniquely anymore.
let specifier = state.specifier_map.normalize(args.specifier)?;
let specifier = state.specifier_map.normalize(specifier)?;
Ok(state.script_version(&specifier))
}

View file

@ -722,7 +722,7 @@ delete Object.prototype.__proto__;
if (scriptVersionCache.has(specifier)) {
return scriptVersionCache.get(specifier);
}
const scriptVersion = ops.op_script_version({ specifier });
const scriptVersion = ops.op_script_version(specifier);
scriptVersionCache.set(specifier, scriptVersion);
return scriptVersion;
},