daqbuf/daqbuffer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Dominik Werder
2024-10-24 09:55:31 +02:00
parent 9a35e2f4fa
commit 1fd41ed513
13 changed files with 183 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nodenet/src/client.rs
View File

@@ -28,7 +28,7 @@ async fn open_bytes_data_streams_http(
let mut streams = Vec::new();
for node in &cluster.nodes {
let item = sitem_data(frame1.clone());
let buf = item.make_frame()?;
let buf = item.make_frame_dyn()?;
let url = node.baseurl().join("/api/4/private/eventdata/frames").unwrap();
debug!("open_event_data_streams_http post {url}");

8
crates/nodenet/src/conn.rs
View File

@@ -139,7 +139,7 @@ pub async fn create_response_bytes_stream(
let fetch_info = evq.ch_conf().to_sf_databuffer()?;
let stream = disk::raw::conn::make_event_blobs_pipe(&evq, &fetch_info, reqctx, ncc)?;
// let stream = stream.map(|x| Box::new(x) as _);
let stream = stream.map(|x| x.make_frame().map(|x| x.freeze()));
let stream = stream.map(|x| x.make_frame_dyn().map(|x| x.freeze()));
let ret = Box::pin(stream);
Ok(ret)
} else {
@@ -161,7 +161,7 @@ pub async fn create_response_bytes_stream(
})
});
// let stream = stream.map(move |x| Box::new(x) as Box<dyn Framable + Send>);
let stream = stream.map(|x| x.make_frame().map(bytes::BytesMut::freeze));
let stream = stream.map(|x| x.make_frame_dyn().map(bytes::BytesMut::freeze));
let ret = Box::pin(stream);
Ok(ret)
}
@@ -204,7 +204,7 @@ async fn events_conn_handler_with_reqid(
msg: format!("buf_len_histo: {:?}", buf_len_histo),
};
let item: Sitemty<ChannelEvents> = Ok(StreamItem::Log(item));
let buf = match item.make_frame() {
let buf = match item.make_frame_dyn() {
Ok(k) => k,
Err(e) => return Err((e, netout))?,
};
@@ -331,7 +331,7 @@ where
Err(ce) => {
let mut out = ce.netout;
let item: Sitemty<ChannelEvents> = Err(err::Error::from_string(ce.err));
let buf = Framable::make_frame(&item)?;
let buf = Framable::make_frame_dyn(&item)?;
out.write_all(&buf).await?;
}
}

2
crates/nodenet/src/conn/test.rs
View File

@@ -89,7 +89,7 @@ fn raw_data_00() {
let qu = EventsSubQuery::from_parts(select, settings, "dummy".into(), log_level);
let frame1 = Frame1Parts::new(qu.clone());
let query = EventQueryJsonStringFrame(serde_json::to_string(&frame1).unwrap());
let frame = sitem_data(query).make_frame()?;
let frame = sitem_data(query).make_frame_dyn()?;
let scyqueue = err::todoval();
let jh = taskrun::spawn(events_conn_handler(client, addr, scyqueue, cfg));
con.write_all(&frame).await.unwrap();