cpp/openttd-patchpack/source Changeset - r28126:9f842b8811bc

Changeset - r28126:9f842b8811bc

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Jonathan G Rennison - 7 months ago 2023-11-09 19:43:47
j.g.rennison@gmail.com

Codechange: Replace AllocatedStringParameters with ArrayStringParameters (#11452)

All uses of AllocatedStringParameters are with a compile-time fixed
constant.
Use of a dynamically allocated buffer on the heap is unnecessary and
increases overhead, particularly due to frequent use as a temporary.

2 files changed with 30 insertions and 12 deletions:

src/strings.cpp

src/strings_internal.h

0 comments (0 inline, 0 general)

src/strings.cpp

➞

Show inline comments

@@ @@ -58,7 +58,7 @@ TextDirection _current_text_dir; ///< Te @@
 std::unique_ptr<icu::Collator> _current_collator;    ///< Collator for the language currently in use.
 #endif /* WITH_ICU_I18N */
-AllocatedStringParameters _global_string_params(20);
+ArrayStringParameters<20> _global_string_params;
 /**
  * Prepare the string parameters for the next formatting run. This means
@@ @@ -927,7 +927,7 @@ static void FormatString(StringBuilder & @@
 		args.SetTypeOfNextParameter(b);
 		switch (b) {
 			case SCC_ENCODED: {
-				AllocatedStringParameters sub_args(20);
+				ArrayStringParameters<20> sub_args;
 				char *p;
 				uint32_t stringid = std::strtoul(str, &p, 16);
@@ @@ -1440,7 +1440,7 @@ static void FormatString(StringBuilder & @@
 						assert(grffile != nullptr);
 						StartTextRefStackUsage(grffile, 6);
-						AllocatedStringParameters tmp_params(6);
+						ArrayStringParameters<6> tmp_params;
 						GetStringWithArgs(builder, GetGRFStringID(grffile->grfid, 0xD000 + callback), tmp_params);
 						StopTextRefStackUsage();
@@ @@ -1448,7 +1448,7 @@ static void FormatString(StringBuilder & @@
+					}
+				}
-				auto tmp_params = AllocatedStringParameters();
+				auto tmp_params = ArrayStringParameters<0>();
 				GetStringWithArgs(builder, e->info.string_id, tmp_params);
 				break;
+			}
@@ @@ -1478,7 +1478,7 @@ static void FormatString(StringBuilder & @@
 				} else if (_scan_for_gender_data) {
 					/* Gender is defined by the industry type.
 					 * STR_FORMAT_INDUSTRY_NAME may have the town first, so it would result in the gender of the town name */
-					auto tmp_params = AllocatedStringParameters();
+					auto tmp_params = ArrayStringParameters<0>();
 					FormatString(builder, GetStringPtr(GetIndustrySpec(i->type)->name), tmp_params, next_substr_case_index);
 				} else {
 					/* First print the town name and the industry type name. */
@@ @@ -1511,7 +1511,7 @@ static void FormatString(StringBuilder & @@
 					/* The station doesn't exist anymore. The only place where we might
 					 * be "drawing" an invalid station is in the case of cargo that is
 					 * in transit. */
-					auto tmp_params = AllocatedStringParameters();
+					auto tmp_params = ArrayStringParameters<0>();
 					GetStringWithArgs(builder, STR_UNKNOWN_STATION, tmp_params);
 					break;
+				}
@@ @@ -1612,7 +1612,7 @@ static void FormatString(StringBuilder & @@
 					auto tmp_params = MakeParameters(si->name);
 					GetStringWithArgs(builder, STR_JUST_RAW_STRING, tmp_params);
 				} else {
-					auto tmp_params = AllocatedStringParameters();
+					auto tmp_params = ArrayStringParameters<0>();
 					GetStringWithArgs(builder, STR_DEFAULT_SIGN_NAME, tmp_params);
+				}
 				break;

src/strings_internal.h

➞

Show inline comments

@@ @@ -198,17 +198,35 @@ public: @@
 };
 /**
- * Extension of StringParameters with its own statically allocated buffer for
+ * Extension of StringParameters with its own statically sized buffer for
  * the parameters.
  */
 class AllocatedStringParameters : public StringParameters {
 	std::vector<StringParameter> params; ///< The actual parameters
 template <size_t N>
 class ArrayStringParameters : public StringParameters {
 	std::array<StringParameter, N> params{}; ///< The actual parameters
 public:
-	AllocatedStringParameters(size_t parameters = 0) : params(parameters)
+	ArrayStringParameters()
+	{
 		this->parameters = span(params.data(), params.size());
+	}
 	ArrayStringParameters(ArrayStringParameters&& other) noexcept
+	{
 		*this = std::move(other);
+	}
 	ArrayStringParameters& operator=(ArrayStringParameters &&other) noexcept
+	{
 		this->offset = other.offset;
 		this->next_type = other.next_type;
 		this->params = std::move(other.params);
 		this->parameters = span(params.data(), params.size());
 		return *this;
+	}
 	ArrayStringParameters(const ArrayStringParameters& other) = delete;
 	ArrayStringParameters& operator=(const ArrayStringParameters &other) = delete;
 };
 /**
@@ @@ -220,7 +238,7 @@ public: @@
 template <typename... Args>
 static auto MakeParameters(const Args&... args)
+{
-	AllocatedStringParameters parameters(sizeof...(args));
+	ArrayStringParameters<sizeof...(args)> parameters;
 	size_t index = 0;
 	(parameters.SetParam(index++, std::forward<const Args&>(args)), ...);
 	return parameters;

0 comments (0 inline, 0 general)