提交 08fc408e authored 作者: Serhij S's avatar Serhij S

crate locking by default

parking_lot_rt = "0.12"
上级 27965904
...@@ -42,7 +42,6 @@ env_logger = "0.10" ...@@ -42,7 +42,6 @@ env_logger = "0.10"
log = "0.4.21" log = "0.4.21"
metrics-exporter-prometheus = { version = "0.14.0", optional = true, default-features = false, features = ["http-listener"] } metrics-exporter-prometheus = { version = "0.14.0", optional = true, default-features = false, features = ["http-listener"] }
metrics = { version = "0.22.3", optional = true } metrics = { version = "0.22.3", optional = true }
parking_lot_rt = "0.12"
snmp = { version = "0.2.2", optional = true } snmp = { version = "0.2.2", optional = true }
rtsc = "0.1" rtsc = "0.1"
rvideo = { version = "0.4", optional = true } rvideo = { version = "0.4", optional = true }
......
use parking_lot_rt::MutexGuard; use crate::locking::MutexGuard;
use rtsc::data_policy::DataDeliveryPolicy; use rtsc::data_policy::DataDeliveryPolicy;
use std::{ use std::{
io::{Read, Write}, io::{Read, Write},
......
...@@ -3,7 +3,7 @@ use crate::{Error, Result}; ...@@ -3,7 +3,7 @@ use crate::{Error, Result};
use super::Client; use super::Client;
use super::Communicator; use super::Communicator;
use super::Protocol; use super::Protocol;
use parking_lot_rt::{Mutex, MutexGuard}; use crate::locking::{Mutex, MutexGuard};
use serial::prelude::*; use serial::prelude::*;
use serial::SystemPort; use serial::SystemPort;
use std::io; use std::io;
......
...@@ -5,8 +5,8 @@ use super::{ ...@@ -5,8 +5,8 @@ use super::{
Client, CommReader, Communicator, ConnectionHandler, ConnectionOptions, Protocol, Stream, Client, CommReader, Communicator, ConnectionHandler, ConnectionOptions, Protocol, Stream,
Timeouts, Timeouts,
}; };
use crate::locking::{Mutex, MutexGuard};
use core::fmt; use core::fmt;
use parking_lot_rt::{Mutex, MutexGuard};
use std::io::{Read, Write}; use std::io::{Read, Write};
use std::net::{self, TcpStream}; use std::net::{self, TcpStream};
use std::net::{SocketAddr, ToSocketAddrs}; use std::net::{SocketAddr, ToSocketAddrs};
......
use std::sync::Arc; use std::sync::Arc;
use parking_lot_rt::Mutex; use crate::locking::Mutex;
use rtsc::data_policy::DataDeliveryPolicy; use rtsc::data_policy::DataDeliveryPolicy;
use crate::pchannel::{self, Receiver, Sender}; use crate::pchannel::{self, Receiver, Sender};
......
use std::future::Future; use std::future::Future;
use std::sync::Arc; use std::sync::Arc;
use parking_lot_rt::Mutex; use crate::locking::Mutex;
use crate::pchannel_async::{self, Receiver, Sender}; use crate::pchannel_async::{self, Receiver, Sender};
use crate::{DataDeliveryPolicy, Error, Result}; use crate::{DataDeliveryPolicy, Error, Result};
......
use crate::io::{modbus::ModbusRegister, IoMapping}; use crate::io::{modbus::ModbusRegister, IoMapping};
use crate::locking::{Mutex, MutexGuard};
use crate::{ use crate::{
comm::{self, Protocol}, comm::{self, Protocol},
Error, Result, Error, Result,
}; };
use binrw::{BinRead, BinWrite}; use binrw::{BinRead, BinWrite};
use parking_lot_rt::{Mutex, MutexGuard};
use rmodbus::{ use rmodbus::{
server::{context::ModbusContext, storage::ModbusStorage, ModbusFrame}, server::{context::ModbusContext, storage::ModbusStorage, ModbusFrame},
ModbusFrameBuf, ModbusProto, ModbusFrameBuf, ModbusProto,
......
...@@ -11,7 +11,7 @@ use thread_rt::{RTParams, Scheduling}; ...@@ -11,7 +11,7 @@ use thread_rt::{RTParams, Scheduling};
pub use log::LevelFilter; pub use log::LevelFilter;
pub use rtsc::{DataChannel, DataPolicy}; pub use rtsc::{DataChannel, DataPolicy};
pub use parking_lot_rt as locking; pub use rtsc::locking;
#[cfg(feature = "metrics")] #[cfg(feature = "metrics")]
pub use metrics; pub use metrics;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论