daqbuf/daqingest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Adapt to updated deps

Browse Source
This commit is contained in:
Dominik Werder
2022-12-06 15:08:32 +01:00
parent 3583862498
commit 53bbd2b99c
7 changed files with 281 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netfetch/src/bsread.rs
View File

@@ -80,9 +80,9 @@ impl TryFrom<&ChannelDesc> for ChannelDescDecoded {
},
},
byte_order: match cd.encoding.as_str() {
"little" => ByteOrder::LE,
"big" => ByteOrder::BE,
_ => ByteOrder::LE,
"little" => ByteOrder::Little,
"big" => ByteOrder::Big,
_ => ByteOrder::Little,
},
agg_kind: AggKind::Plain,
};
@@ -209,7 +209,7 @@ impl Parser {
let shape = Shape::from_bsread_jsval(&ch.shape)?;
match sty {
ScalarType::I64 => match &bo {
ByteOrder::LE => match &shape {
ByteOrder::Little => match &shape {
Shape::Scalar => {
assert_eq!(fr.data().len(), 8);
let _v = i64::from_le_bytes(fr.data().try_into()?);

4
netfetch/src/ca/conn.rs
View File

@@ -817,7 +817,7 @@ impl CaConn {
shape,
agg_kind: netpod::AggKind::Plain,
// TODO these play no role in series id:
byte_order: netpod::ByteOrder::LE,
byte_order: netpod::ByteOrder::Little,
compression: None,
};
cx.waker().wake_by_ref();
@@ -1236,7 +1236,7 @@ impl CaConn {
shape,
agg_kind: netpod::AggKind::Plain,
// TODO these play no role in series id:
byte_order: netpod::ByteOrder::LE,
byte_order: netpod::ByteOrder::Little,
compression: None,
};
let z = unsafe {

7
netfetch/src/ca/connset.rs
View File

@@ -286,8 +286,11 @@ impl CaConnSet {
pub async fn addr_nth_mod(&self, n: usize) -> Option<SocketAddr> {
let g = self.ca_conn_ress.lock().await;
let u = g.len();
let n = n % u;
let len = g.len();
if len < 1 {
return None;
}
let n = n % len;
g.keys().take(n).last().map(Clone::clone)
}
}

44
netfetch/src/channelwriter.rs
View File

@@ -620,61 +620,61 @@ impl ChannelWriterAll {
let (ts_msp_lsp, acc): (fn(u64, u64) -> (u64, u64), Box<dyn MsgAcceptor + Send>) = match &shape {
Shape::Scalar => match &scalar_type {
ScalarType::U16 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorScalarU16LE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorScalarU16BE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
},
ScalarType::U32 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorScalarU32LE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorScalarU32BE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
},
ScalarType::I16 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorScalarI16LE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorScalarI16BE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
},
ScalarType::I32 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorScalarI32LE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorScalarI32BE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
},
ScalarType::F32 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorScalarF32LE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorScalarF32BE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
},
ScalarType::F64 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorScalarF64LE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorScalarF64BE::new(series as i64, opts);
(ts_msp_lsp_1, Box::new(acc) as _)
}
@@ -696,51 +696,51 @@ impl ChannelWriterAll {
}
},
ScalarType::U16 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorArrayU16LE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorArrayU16BE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}
},
ScalarType::I16 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorArrayI16LE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorArrayI16BE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}
},
ScalarType::I32 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorArrayI32LE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorArrayI32BE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}
},
ScalarType::F32 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorArrayF32LE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorArrayF32BE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}
},
ScalarType::F64 => match &byte_order {
ByteOrder::LE => {
ByteOrder::Little => {
let acc = MsgAcceptorArrayF64LE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}
ByteOrder::BE => {
ByteOrder::Big => {
let acc = MsgAcceptorArrayF64BE::new(series as i64, opts);
(ts_msp_lsp_2, Box::new(acc) as _)
}