1313#include < cstring>
1414#include < exception>
1515#include < fcntl.h>
16+ #include < format>
1617#include < getopt.h>
1718#include < iostream>
1819#include < linux/fs.h>
19- #include < print>
2020#include < string>
2121#include < sys/ioctl.h>
2222#include < sys/signalfd.h>
@@ -163,35 +163,38 @@ static_assert(ublk::QueueHandler<LoopHandler>);
163163
164164ex::task<void > wait_signal (int ctrl_fd, int signal_fd, uint32_t dev_id,
165165 ex::inplace_stop_source &source) {
166- std::println (" ublk-loop: ublk device {} is running..." , dev_id);
166+ std::cout << std::format (" ublk-loop: ublk device {} is running..." , dev_id)
167+ << ' \n ' ;
167168 auto parent_token = co_await ex::read_env (ex::get_stop_token);
168- auto stop_request = [&] noexcept { source.request_stop (); };
169+ auto stop_request = [&]() noexcept { source.request_stop (); };
169170 ex::inplace_stop_callback<decltype (stop_request)> cb{
170171 parent_token, std::move (stop_request)};
171172 signalfd_siginfo si;
172173 co_await (condy::async_read (signal_fd, condy::buffer (&si, sizeof (si)), 0 ) |
173174 ex::write_env (ex::prop{ex::get_stop_token, source.get_token ()}));
174- std::println (" ublk-loop: received signal {}, shutting down..." ,
175- si.ssi_signo );
175+ std::cout << std::format (" ublk-loop: received signal {}, shutting down..." ,
176+ si.ssi_signo )
177+ << ' \n ' ;
176178 co_await ublk::stop_dev (ctrl_fd, dev_id);
177179}
178180
179181void print_usage (const char *prog) {
180- std::println (" Usage: {} [OPTIONS] -f <backing_file>" , prog);
181- std::println (
182- " Run a ublk loop device backed by a regular file or block device." );
183- std::println ();
184- std::println (" Options:" );
185- std::println (" -f <file> backing file or block device (required)" );
186- std::println (
187- " -n <dev_id> ublk device id, -1: auto-allocation (default)" );
188- std::println (" -q <queues> nr_hw_queues (default: 1)" );
189- std::println (
190- " -d <depth> queue depth, max in-flight io commands (default: 64)" );
191- std::println (" -b <bytes> io buffer size (default: 524288)" );
192- std::println (
193- " -p enable UBLK_F_UNPRIVILEGED_DEV (unprivileged mode)" );
194- std::println (" -h show this help and exit" );
182+ std::cout << std::format (" Usage: {} [OPTIONS] -f <backing_file>" , prog)
183+ << ' \n ' ;
184+ std::cout << " Run a ublk loop device backed by a regular file or block "
185+ " device.\n " ;
186+ std::cout << ' \n ' ;
187+ std::cout << " Options:\n " ;
188+ std::cout << " -f <file> backing file or block device (required)\n " ;
189+ std::cout << " -n <dev_id> ublk device id, -1: auto-allocation "
190+ " (default)\n " ;
191+ std::cout << " -q <queues> nr_hw_queues (default: 1)\n " ;
192+ std::cout << " -d <depth> queue depth, max in-flight io commands "
193+ " (default: 64)\n " ;
194+ std::cout << " -b <bytes> io buffer size (default: 524288)\n " ;
195+ std::cout << " -p enable UBLK_F_UNPRIVILEGED_DEV "
196+ " (unprivileged mode)\n " ;
197+ std::cout << " -h show this help and exit\n " ;
195198}
196199
197200} // namespace
@@ -245,24 +248,26 @@ int main(int argc, char *argv[]) noexcept(false) {
245248 " open backing file" );
246249 }
247250 auto d_backing =
248- ublk::detail::defer ([&] noexcept { close (backing_fd); });
251+ ublk::detail::defer ([&]() noexcept { close (backing_fd); });
249252
250253 int flags = fcntl (backing_fd, F_GETFL );
251254 if (flags >= 0 && fcntl (backing_fd, F_SETFL , flags | O_DIRECT ) < 0 ) {
252- std::println (
253- std::cerr,
254- " ublk-loop: failed to set O_DIRECT on backing file: {}" ,
255- std::strerror (errno));
255+ std::cerr << std::format (
256+ " ublk-loop: failed to set O_DIRECT on backing "
257+ " file: {}" ,
258+ std::strerror (errno))
259+ << ' \n ' ;
256260 }
257261
258262 FileInfo file_info;
259263 lo_file_size (backing_fd, file_info);
260264 uint64_t dev_sectors = file_info.size / SECTOR_SIZE ;
261- std::println (" ublk-loop: backing file {} ({} bytes, {} sectors, "
262- " logical {}B, physical {}B)" ,
263- backing_path, file_info.size , dev_sectors,
264- 1u << file_info.logical_bs_shift ,
265- 1u << file_info.physical_bs_shift );
265+ std::cout << std::format (" ublk-loop: backing file {} ({} bytes, {}"
266+ " sectors, logical {}B, physical {}B)" ,
267+ backing_path, file_info.size , dev_sectors,
268+ 1u << file_info.logical_bs_shift ,
269+ 1u << file_info.physical_bs_shift )
270+ << ' \n ' ;
266271
267272 sigset_t mask;
268273 sigemptyset (&mask);
@@ -274,20 +279,20 @@ int main(int argc, char *argv[]) noexcept(false) {
274279 if (signal_fd < 0 ) {
275280 throw std::system_error (errno, std::generic_category (), " signalfd" );
276281 }
277- auto d = ublk::detail::defer ([&] noexcept { close (signal_fd); });
282+ auto d = ublk::detail::defer ([&]() noexcept { close (signal_fd); });
278283
279284 int ctrl_fd = open (" /dev/ublk-control" , O_RDWR | O_CLOEXEC );
280285 if (ctrl_fd < 0 ) {
281286 throw std::system_error (errno, std::generic_category (),
282287 " open /dev/ublk-control" );
283288 }
284- auto d2 = ublk::detail::defer ([&] noexcept { close (ctrl_fd); });
289+ auto d2 = ublk::detail::defer ([&]() noexcept { close (ctrl_fd); });
285290
286291 condy::RuntimeOptions options;
287292 options.enable_sqe128 ();
288293 condy::Runtime runtime (options);
289294 std::jthread loop ([&]() { runtime.run (); });
290- auto d3 = ublk::detail::defer ([&] noexcept { runtime.allow_exit (); });
295+ auto d3 = ublk::detail::defer ([&]() noexcept { runtime.allow_exit (); });
291296 ex::scheduler auto sched = condy::get_scheduler (runtime);
292297
293298 uint64_t features;
@@ -334,10 +339,10 @@ int main(int argc, char *argv[]) noexcept(false) {
334339
335340 ex::sync_wait (ex::starts_on (sched, s));
336341 } catch (const std::system_error &e) {
337- std::println ( std::cerr, " ublk-loop: {}" , e.what ());
342+ std::cerr << std::format ( " ublk-loop: {}" , e.what ()) << ' \n ' ;
338343 return e.code ().value ();
339344 } catch (const std::exception &e) {
340- std::println ( std::cerr, " ublk-loop: {}" , e.what ());
345+ std::cerr << std::format ( " ublk-loop: {}" , e.what ()) << ' \n ' ;
341346 return 1 ;
342347 }
343348
0 commit comments