Merge pull request ceph#65227 from tchaikov/wip-generate-brace-init

src: replace push_back(T{}) with emplace_back()

Reviewed-by: Ronen Friedman <[email protected]>
Reviewed-by: Adam C. Emerson <[email protected]>
Reviewed-by: Ilya Dryomov <[email protected]>

Author: idryomov

src/auth/Auth.h

@@ -76,7 +76,7 @@ struct EntityAuth {
   }
   static std::list<EntityAuth> generate_test_instances() {
     std::list<EntityAuth> ls;
-    ls.push_back(EntityAuth{});
+    ls.emplace_back();
     return ls;
   }
 };
@@ -122,10 +122,10 @@ struct AuthCapsInfo {
   }
   static std::list<AuthCapsInfo> generate_test_instances() {
     std::list<AuthCapsInfo> ls;
-    ls.push_back(AuthCapsInfo{});
-    ls.push_back(AuthCapsInfo{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().allow_all = true;
-    ls.push_back(AuthCapsInfo{});
+    ls.emplace_back();
     ls.back().caps.append("foo");
     ls.back().caps.append("bar");
     return ls;
@@ -190,8 +190,8 @@ struct AuthTicket {
   }
   static std::list<AuthTicket> generate_test_instances() {
     std::list<AuthTicket> ls;
-    ls.push_back(AuthTicket{});
-    ls.push_back(AuthTicket{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().name.set_id("client.123");
     ls.back().global_id = 123;
     ls.back().init_timestamps(utime_t(123, 456), 7);
@@ -290,8 +290,8 @@ struct ExpiringCryptoKey {
   }
   static std::list<ExpiringCryptoKey> generate_test_instances() {
     std::list<ExpiringCryptoKey> ls;
-    ls.push_back(ExpiringCryptoKey{});
-    ls.push_back(ExpiringCryptoKey{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().key.set_secret(
       CEPH_CRYPTO_AES, bufferptr("1234567890123456", 16), utime_t(123, 456));
     return ls;
@@ -365,8 +365,8 @@ struct RotatingSecrets {
   }
   static std::list<RotatingSecrets> generate_test_instances() {
     std::list<RotatingSecrets> ls;
-    ls.push_back(RotatingSecrets{});
-    ls.push_back(RotatingSecrets{});
+    ls.emplace_back();
+    ls.emplace_back();
     ExpiringCryptoKey eck{};
     ls.back().add(eck);
     return ls;

src/auth/cephx/CephxKeyServer.h

@@ -88,8 +88,8 @@ struct KeyServerData {
   }
   static std::list<KeyServerData> generate_test_instances() {
     std::list<KeyServerData> ls;
-    ls.push_back(KeyServerData{});
-    ls.push_back(KeyServerData{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().version = 1;
     return ls;
   }
@@ -188,11 +188,11 @@ struct KeyServerData {
     }
     static std::list<Incremental> generate_test_instances() {
       std::list<Incremental> ls;
-      ls.push_back(Incremental{});
+      ls.emplace_back();
       ls.back().op = AUTH_INC_DEL;
-      ls.push_back(Incremental{});
+      ls.emplace_back();
       ls.back().op = AUTH_INC_ADD;
-      ls.push_back(Incremental{});
+      ls.emplace_back();
       ls.back().op = AUTH_INC_SET_ROTATING;
       return ls;
     }

src/auth/cephx/CephxProtocol.h

@@ -60,7 +60,7 @@ struct CephXServerChallenge {
   }
   static std::list<CephXServerChallenge> generate_test_instances() {
     std::list<CephXServerChallenge> ls;
-    ls.push_back(CephXServerChallenge{});
+    ls.emplace_back();
     ls.back().server_challenge = 1;
     return ls;
   }
@@ -86,7 +86,7 @@ struct CephXRequestHeader {
   }
   static std::list<CephXRequestHeader> generate_test_instances() {
     std::list<CephXRequestHeader> ls;
-    ls.push_back(CephXRequestHeader{});
+    ls.emplace_back();
     ls.back().request_type = 1;
     return ls;
   }
@@ -113,7 +113,7 @@ struct CephXResponseHeader {
   }
   static std::list<CephXResponseHeader> generate_test_instances() {
     std::list<CephXResponseHeader> ls;
-    ls.push_back(CephXResponseHeader{});
+    ls.emplace_back();
     ls.back().request_type = 1;
     ls.back().status = 0;
     return ls;
@@ -150,7 +150,7 @@ struct CephXTicketBlob {
 
   static std::list<CephXTicketBlob> generate_test_instances() {
     std::list<CephXTicketBlob> ls;
-    ls.push_back(CephXTicketBlob{});
+    ls.emplace_back();
     ls.back().secret_id = 123;
     ls.back().blob.append(std::string_view("this is a blob"));
     return ls;
@@ -204,10 +204,10 @@ struct CephXAuthenticate {
   }
   static std::list<CephXAuthenticate> generate_test_instances() {
     std::list<CephXAuthenticate> ls;
-    ls.push_back(CephXAuthenticate{});
+    ls.emplace_back();
     ls.back().client_challenge = 0;
     ls.back().key = 0;
-    ls.push_back(CephXAuthenticate{});
+    ls.emplace_back();
     ls.back().client_challenge = 1;
     ls.back().key = 2;
     ls.back().old_ticket.secret_id = 3;
@@ -237,7 +237,7 @@ struct CephXChallengeBlob {
   }
   static std::list<CephXChallengeBlob> generate_test_instances() {
     std::list<CephXChallengeBlob> ls;
-    ls.push_back(CephXChallengeBlob{});
+    ls.emplace_back();
     ls.back().server_challenge = 123;
     ls.back().client_challenge = 456;
     return ls;
@@ -299,7 +299,7 @@ struct CephXServiceTicketRequest {
 
   static std::list<CephXServiceTicketRequest> generate_test_instances() {
     std::list<CephXServiceTicketRequest> ls;
-    ls.push_back(CephXServiceTicketRequest{});
+    ls.emplace_back();
     ls.back().keys = 123;
     return ls;
   }
@@ -342,9 +342,9 @@ struct CephXAuthorizeReply {
   }
   static std::list<CephXAuthorizeReply> generate_test_instances() {
     std::list<CephXAuthorizeReply> ls;
-    ls.push_back(CephXAuthorizeReply{});
+    ls.emplace_back();
     ls.back().nonce_plus_one = 0;
-    ls.push_back(CephXAuthorizeReply{});
+    ls.emplace_back();
     ls.back().nonce_plus_one = 123;
     ls.back().connection_secret = "secret";
     return ls;
@@ -457,8 +457,8 @@ struct CephXServiceTicket {
   }
   static std::list<CephXServiceTicket> generate_test_instances() {
     std::list<CephXServiceTicket> ls;
-    ls.push_back(CephXServiceTicket{});
-    ls.push_back(CephXServiceTicket{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().session_key.set_secret(
       CEPH_CRYPTO_AES, bufferptr("1234567890123456", 16), utime_t(123, 456));
     ls.back().validity = utime_t(123, 456);
@@ -492,8 +492,8 @@ struct CephXServiceTicketInfo {
   }
   static std::list<CephXServiceTicketInfo> generate_test_instances() {
     std::list<CephXServiceTicketInfo> ls;
-    ls.push_back(CephXServiceTicketInfo{});
-    ls.push_back(CephXServiceTicketInfo{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().ticket.global_id = 1234;
     ls.back().ticket.init_timestamps(utime_t(123, 456), utime_t(123, 456));
     ls.back().session_key.set_secret(
@@ -522,7 +522,7 @@ struct CephXAuthorizeChallenge : public AuthAuthorizerChallenge {
   }
   static std::list<CephXAuthorizeChallenge> generate_test_instances() {
     std::list<CephXAuthorizeChallenge> ls;
-    ls.push_back(CephXAuthorizeChallenge{});
+    ls.emplace_back();
     ls.back().server_challenge = 1234;
     return ls;
   }
@@ -558,8 +558,8 @@ struct CephXAuthorize {
   }
   static std::list<CephXAuthorize> generate_test_instances() {
     std::list<CephXAuthorize> ls;
-    ls.push_back(CephXAuthorize{});
-    ls.push_back(CephXAuthorize{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().nonce = 1234;
     ls.back().have_challenge = true;
     ls.back().server_challenge_plus_one = 1234;

src/cls/2pc_queue/cls_2pc_queue_ops.h

@@ -32,9 +32,9 @@ struct cls_2pc_queue_reserve_op {
 
   static std::list<cls_2pc_queue_reserve_op> generate_test_instances() {
     std::list<cls_2pc_queue_reserve_op> ls;
-    ls.push_back(cls_2pc_queue_reserve_op{});
+    ls.emplace_back();
     ls.back().size = 0;
-    ls.push_back(cls_2pc_queue_reserve_op{});
+    ls.emplace_back();
     ls.back().size = 123;
     ls.back().entries = 456;
     return ls;
@@ -63,7 +63,7 @@ struct cls_2pc_queue_reserve_ret {
 
   static std::list<cls_2pc_queue_reserve_ret> generate_test_instances() {
     std::list<cls_2pc_queue_reserve_ret> ls;
-    ls.push_back(cls_2pc_queue_reserve_ret{});
+    ls.emplace_back();
     ls.back().id = 123;
     return ls;
   }
@@ -95,7 +95,7 @@ struct cls_2pc_queue_commit_op {
 
   static std::list<cls_2pc_queue_commit_op> generate_test_instances() {
     std::list<cls_2pc_queue_commit_op> ls;
-    ls.push_back(cls_2pc_queue_commit_op{});
+    ls.emplace_back();
     ls.back().id = 123;
     ls.back().bl_data_vec.push_back(ceph::buffer::list());
     ls.back().bl_data_vec.back().append("foo");
@@ -125,7 +125,7 @@ struct cls_2pc_queue_abort_op {
   }
   static std::list<cls_2pc_queue_abort_op> generate_test_instances() {
     std::list<cls_2pc_queue_abort_op> ls;
-    ls.push_back(cls_2pc_queue_abort_op{});
+    ls.emplace_back();
     ls.back().id = 1;
     return ls;
   }
@@ -152,8 +152,8 @@ struct cls_2pc_queue_expire_op {
   }
   static std::list<cls_2pc_queue_expire_op> generate_test_instances() {
     std::list<cls_2pc_queue_expire_op> ls;
-    ls.push_back(cls_2pc_queue_expire_op{});
-    ls.push_back(cls_2pc_queue_expire_op{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().stale_time = ceph::coarse_real_time::min();
     return ls;
   }
@@ -187,8 +187,8 @@ struct cls_2pc_queue_reservations_ret {
 
   static std::list<cls_2pc_queue_reservations_ret> generate_test_instances() {
     std::list<cls_2pc_queue_reservations_ret> ls;
-    ls.push_back(cls_2pc_queue_reservations_ret{});
-    ls.push_back(cls_2pc_queue_reservations_ret{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().reservations[1] = cls_2pc_reservation();
     ls.back().reservations[2] = cls_2pc_reservation();
     return ls;

src/cls/2pc_queue/cls_2pc_queue_types.h

@@ -47,9 +47,9 @@ struct cls_2pc_reservation
 
   static std::list<cls_2pc_reservation> generate_test_instances() {
     std::list<cls_2pc_reservation> ls;
-    ls.push_back(cls_2pc_reservation{});
+    ls.emplace_back();
     ls.back().size = 0;
-    ls.push_back(cls_2pc_reservation{});
+    ls.emplace_back();
     ls.back().size = 123;
     ls.back().timestamp = ceph::coarse_real_clock::zero();
     return ls;
@@ -105,8 +105,8 @@ struct cls_2pc_urgent_data
 
   static std::list<cls_2pc_urgent_data> generate_test_instances() {
     std::list<cls_2pc_urgent_data> ls;
-    ls.push_back(cls_2pc_urgent_data{});
-    ls.push_back(cls_2pc_urgent_data{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().reserved_size = 123;
     ls.back().last_id = 456;
     ls.back().reservations.emplace(789, cls_2pc_reservation(1, ceph::coarse_real_clock::zero(), 2));

src/cls/cas/cls_cas_internal.h

@@ -95,7 +95,7 @@ struct chunk_refs_t {
   }
   static std::list<chunk_refs_t> generate_test_instances() {
     std::list<chunk_refs_t> ls;
-    ls.push_back(chunk_refs_t{});
+    ls.emplace_back();
     return ls;
   }
 };
@@ -149,8 +149,8 @@ struct chunk_refs_by_object_t : public chunk_refs_t::refs_t {
   }
   static std::list<chunk_refs_by_object_t> generate_test_instances() {
     std::list<chunk_refs_by_object_t> ls;
-    ls.push_back(chunk_refs_by_object_t{});
-    ls.push_back(chunk_refs_by_object_t{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().by_object.insert(hobject_t(sobject_t("foo", CEPH_NOSNAP)));
     ls.back().by_object.insert(hobject_t(sobject_t("bar", CEPH_NOSNAP)));
     return ls;
@@ -398,8 +398,8 @@ struct chunk_refs_count_t : public chunk_refs_t::refs_t {
   }
   static std::list<chunk_refs_count_t> generate_test_instances() {
     std::list<chunk_refs_count_t> o;
-    o.push_back(chunk_refs_count_t{});
-    o.push_back(chunk_refs_count_t{});
+    o.emplace_back();
+    o.emplace_back();
     o.back().total = 123;
     return o;
   }

src/cls/cas/cls_cas_ops.h

@@ -41,7 +41,7 @@ struct cls_cas_chunk_create_or_get_ref_op {
   }
   static std::list<cls_cas_chunk_create_or_get_ref_op> generate_test_instances() {
     std::list<cls_cas_chunk_create_or_get_ref_op> ls;
-    ls.push_back(cls_cas_chunk_create_or_get_ref_op{});
+    ls.emplace_back();
     return ls;
   }
 };
@@ -69,7 +69,7 @@ struct cls_cas_chunk_get_ref_op {
   }
   static std::list<cls_cas_chunk_get_ref_op> generate_test_instances() {
     std::list<cls_cas_chunk_get_ref_op> ls;
-    ls.push_back(cls_cas_chunk_get_ref_op{});
+    ls.emplace_back();
     return ls;
   }
 };
@@ -98,7 +98,7 @@ struct cls_cas_chunk_put_ref_op {
   }
   static std::list<cls_cas_chunk_put_ref_op> generate_test_instances() {
     std::list<cls_cas_chunk_put_ref_op> ls;
-    ls.push_back(cls_cas_chunk_put_ref_op{});
+    ls.emplace_back();
     return ls;
   }
 };

src/cls/fifo/cls_fifo.cc

@@ -59,8 +59,8 @@ struct entry_header {
   }
   static std::list<entry_header> generate_test_instances() {
     std::list<entry_header> ls;
-    ls.push_back(entry_header{});
-    ls.push_back(entry_header{});
+    ls.emplace_back();
+    ls.emplace_back();
     ls.back().mtime = ceph::real_clock::now();
     return ls;
   }

src/cls/fifo/cls_fifo_ops.h

@@ -79,8 +79,8 @@ struct create_meta
   }
   static std::list<create_meta> generate_test_instances() {
     std::list<create_meta> o;
-    o.push_back(create_meta{});
-    o.push_back(create_meta{});
+    o.emplace_back();
+    o.emplace_back();
     o.back().id = "id";
     objv v1;
     v1.instance = "inst1";
@@ -116,8 +116,8 @@ struct get_meta
   }
   static std::list<get_meta> generate_test_instances() {
     std::list<get_meta> o;
-    o.push_back(get_meta{});
-    o.push_back(get_meta{});
+    o.emplace_back();
+    o.emplace_back();
     objv v1;
     v1.instance = "inst1";
     v1.ver = 1;
@@ -155,8 +155,8 @@ struct get_meta_reply
   }
   static std::list<get_meta_reply> generate_test_instances() {
     std::list<get_meta_reply> o;
-    o.push_back(get_meta_reply{});
-    o.push_back(get_meta_reply{});
+    o.emplace_back();
+    o.emplace_back();
     o.back().info = fifo::info();
     o.back().part_header_size = 1024;
     o.back().part_entry_overhead = 1024;