This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8962

rhg: Add debug timing
ClosedPublic

Authored by acezar on Aug 26 2020, 9:24 AM.

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb1cea0dc9db0: rhg: Add debug timing

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

acezar created this revision.Aug 26 2020, 9:24 AM
marmoute accepted this revision.Aug 26 2020, 3:29 PM
marmoute added a subscriber: marmoute.

This looks straighforward.

Alphare accepted this revision.Aug 28 2020, 8:58 AM
acezar updated this revision to Diff 22494.Aug 31 2020, 10:40 AM
acezar updated this revision to Diff 22531.Sep 3 2020, 4:51 AM
acezar updated this revision to Diff 22535.Sep 3 2020, 8:50 AM
martinvonz added a subscriber: martinvonz.Sep 22 2020, 11:28 PM
martinvonz added inline comments.
rust/rhg/src/main.rs
19

Does this have to be env_logger now that D8990 has landed (I didn't check if it had when you sent this)?

Alphare accepted this revision.Sep 23 2020, 3:05 AM
Alphare added inline comments.
rust/rhg/src/main.rs
19

This is in rhg that has its own dependency on simple_logger. However it would be a good idea to use env_logger in rhg as well for the same reasons. But that would be in a separate patch.

acezar updated this revision to Diff 22776.Sep 23 2020, 6:21 AM
acezar added a commit: rHGb1cea0dc9db0: rhg: Add debug timing.Sep 23 2020, 10:56 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb1cea0dc9db0: rhg: Add debug timing (authored by acezar). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 22789

rust/Cargo.lock

"winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "rhg" name = "rhg"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hg-core 0.1.0", "hg-core 0.1.0",
"log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
"micro-timer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "same-file" name = "same-file"
version = "1.0.6" version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

rust/rhg/Cargo.toml

[package] [package]
name = "rhg" name = "rhg"
version = "0.1.0" version = "0.1.0"
authors = ["Antoine Cezar <antoine.cezar@octobus.net>"] authors = ["Antoine Cezar <antoine.cezar@octobus.net>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
hg-core = { path = "../hg-core"} hg-core = { path = "../hg-core"}
clap = "2.33.1" clap = "2.33.1"
log = "0.4.11"
micro-timer = "0.3.1"
env_logger = "0.7.1"

rust/rhg/src/commands/debugdata.rs

use crate::commands::Command; use crate::commands::Command;
use crate::error::{CommandError, CommandErrorKind}; use crate::error::{CommandError, CommandErrorKind};
use crate::ui::utf8_to_local; use crate::ui::utf8_to_local;
use crate::ui::Ui; use crate::ui::Ui;
use hg::operations::{ use hg::operations::{
DebugData, DebugDataError, DebugDataErrorKind, DebugDataKind, DebugData, DebugDataError, DebugDataErrorKind, DebugDataKind,
}; };
use micro_timer::timed;
pub const HELP_TEXT: &str = " pub const HELP_TEXT: &str = "
Dump the contents of a data file revision Dump the contents of a data file revision
"; ";
pub struct DebugDataCommand<'a> { pub struct DebugDataCommand<'a> {
rev: &'a str, rev: &'a str,
kind: DebugDataKind, kind: DebugDataKind,
} }
impl<'a> DebugDataCommand<'a> { impl<'a> DebugDataCommand<'a> {
pub fn new(rev: &'a str, kind: DebugDataKind) -> Self { pub fn new(rev: &'a str, kind: DebugDataKind) -> Self {
DebugDataCommand { rev, kind } DebugDataCommand { rev, kind }
} }
} }
impl<'a> Command for DebugDataCommand<'a> { impl<'a> Command for DebugDataCommand<'a> {
#[timed]
fn run(&self, ui: &Ui) -> Result<(), CommandError> { fn run(&self, ui: &Ui) -> Result<(), CommandError> {
let mut operation = DebugData::new(self.rev, self.kind); let mut operation = DebugData::new(self.rev, self.kind);
let data = let data =
operation.run().map_err(|e| to_command_error(self.rev, e))?; operation.run().map_err(|e| to_command_error(self.rev, e))?;
let mut stdout = ui.stdout_buffer(); let mut stdout = ui.stdout_buffer();
stdout.write_all(&data)?; stdout.write_all(&data)?;
stdout.flush()?; stdout.flush()?;

rust/rhg/src/main.rs

extern crate log;
use clap::App; use clap::App;
use clap::AppSettings; use clap::AppSettings;
use clap::Arg; use clap::Arg;
use clap::ArgGroup; use clap::ArgGroup;
use clap::ArgMatches; use clap::ArgMatches;
use clap::SubCommand; use clap::SubCommand;
use hg::operations::DebugDataKind; use hg::operations::DebugDataKind;
use std::convert::TryFrom; use std::convert::TryFrom;
mod commands; mod commands;
mod error; mod error;
mod exitcode; mod exitcode;
mod ui; mod ui;
use commands::Command; use commands::Command;
use error::CommandError; use error::CommandError;
fn main() { fn main() {
env_logger::init();
martinvonzUnsubmitted
Not Done

Does this have to be env_logger now that D8990 has landed (I didn't check if it had when you sent this)?

martinvonz: Does this have to be `env_logger` now that D8990 has landed (I didn't check if it had when you…
AlphareUnsubmitted
Not Done

This is in rhg that has its own dependency on simple_logger. However it would be a good idea to use env_logger in rhg as well for the same reasons. But that would be in a separate patch.

Alphare: This is in `rhg` that has its own dependency on `simple_logger`. However it would be a good…
let app = App::new("rhg") let app = App::new("rhg")
.setting(AppSettings::AllowInvalidUtf8) .setting(AppSettings::AllowInvalidUtf8)
.setting(AppSettings::SubcommandRequired) .setting(AppSettings::SubcommandRequired)
.setting(AppSettings::VersionlessSubcommands) .setting(AppSettings::VersionlessSubcommands)
.version("0.0.1") .version("0.0.1")
.subcommand( .subcommand(
SubCommand::with_name("root").about(commands::root::HELP_TEXT), SubCommand::with_name("root").about(commands::root::HELP_TEXT),
) )