1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249
|
Description: use alignment-safe buffer handling.
Currently we are using assignment to copy the contents of a variable of
arbitrary type into a buffer, but this is not portable because the buffer
address may not be aligned. Use memcpy() instead, which should be
comparable performance but alignment-safe.
Author: Steve Langasek <[email protected]>
Last-Modified: 2019-01-25
Bug-Debian: https://bugs.debian.org/919763
Index: adios-1.13.1/src/core/adios_bp_v1.c
===================================================================
--- adios-1.13.1.orig/src/core/adios_bp_v1.c
adios-1.13.1/src/core/adios_bp_v1.c
@@ -155,21 155,21 @@
uint64_t attrs_end = b->file_size - 28;
- b->pg_index_offset = *(uint64_t *) (b->buff b->offset);
memcpy(&b->pg_index_offset, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(b->pg_index_offset);
}
b->offset = 8;
- b->vars_index_offset = *(uint64_t *) (b->buff b->offset);
memcpy(&b->vars_index_offset, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(b->vars_index_offset);
}
b->offset = 8;
- b->attrs_index_offset = *(uint64_t *) (b->buff b->offset);
memcpy(&b->attrs_index_offset, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(b->attrs_index_offset);
}
@@ -203,13 203,13 @@
uint64_t process_groups_count;
uint64_t process_groups_length;
- process_groups_count = *(uint64_t *) (b->buff b->offset);
memcpy(&process_groups_count, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(process_groups_count);
}
b->offset = 8;
- process_groups_length = *(uint64_t *) (b->buff b->offset);
memcpy(&process_groups_length, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(process_groups_length);
}
@@ -275,7 275,8 @@
}
b->offset = 4;
- (*root)->offset_in_file = *(uint64_t *) (b->buff b->offset);
memcpy(&((*root)->offset_in_file), b->buff b->offset,
sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64((*root)->offset_in_file);
}
@@ -321,7 322,7 @@
}
b->offset = 4;
- vars_length = *(uint64_t *) (b->buff b->offset);
memcpy(&vars_length, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(vars_length);
}
@@ -390,7 391,8 @@
(*root)->type = (enum ADIOS_DATATYPES) flag;
b->offset = 1;
- characteristics_sets_count = *(uint64_t *) (b->buff b->offset);
memcpy(&characteristics_sets_count, b->buff b->offset,
sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(characteristics_sets_count);
}
@@ -672,8 674,8 @@
case adios_characteristic_offset:
{
- (*root)->characteristics [j].offset =
- *(uint64_t *) (b->buff b->offset);
memcpy(&((*root)->characteristics [j].offset),
b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64((*root)->characteristics [j].offset);
}
@@ -684,8 686,8 @@
case adios_characteristic_payload_offset:
{
- (*root)->characteristics [j].payload_offset =
- *(uint64_t *) (b->buff b->offset);
memcpy(&((*root)->characteristics [j].payload_offset),
b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64((*root)->characteristics [j].payload_offset);
}
@@ -814,7 816,7 @@
}
b->offset = 4;
- attrs_length = *(uint64_t *) (b->buff b->offset);
memcpy(&attrs_length, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(attrs_length);
}
@@ -884,7 886,8 @@
(*root)->type = (enum ADIOS_DATATYPES) flag;
b->offset = 1;
- characteristics_sets_count = *(uint64_t *) (b->buff b->offset);
memcpy(&characteristics_sets_count, b->buff b->offset,
sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(characteristics_sets_count);
}
@@ -1050,8 1053,8 @@
case adios_characteristic_offset:
{
- (*root)->characteristics [j].offset =
- *(uint64_t *) (b->buff b->offset);
memcpy(&((*root)->characteristics [j].offset),
b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64((*root)->characteristics [j].offset);
}
@@ -1074,8 1077,8 @@
case adios_characteristic_payload_offset:
{
- (*root)->characteristics [j].payload_offset =
- *(uint64_t *) (b->buff b->offset);
memcpy(&((*root)->characteristics [j].payload_offset),
b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64((*root)->characteristics [j].payload_offset);
}
@@ -1187,7 1190,7 @@
}
uint64_t size;
- size = *(uint64_t *) (b->buff b->offset);
memcpy(&size, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(size);
}
@@ -1298,7 1301,7 @@
swap_32(vars_header->count);
}
b->offset = 4;
- vars_header->length = *(uint64_t *) (b->buff b->offset);
memcpy(&vars_header->length, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(vars_header->length);
}
@@ -1325,7 1328,7 @@
uint16_t len;
uint8_t flag;
- length_of_var = *(uint64_t *) (b->buff b->offset);
memcpy(&length_of_var, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(length_of_var);
}
@@ -1425,7 1428,8 @@
}
else
{
- (*root)->dimension.rank = *(uint64_t *) (b->buff b->offset);
memcpy(&((*root)->dimension.rank), b->buff b->offset,
sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64((*root)->dimension.rank);
}
@@ -1449,8 1453,8 @@
}
else
{
- (*root)->global_dimension.rank = *(uint64_t *)
- (b->buff b->offset);
memcpy(&((*root)->global_dimension.rank), b->buff b->offset,
sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64((*root)->global_dimension.rank);
}
@@ -1473,7 1477,8 @@
}
else
{
- (*root)->local_offset.rank = *(uint64_t *) (b->buff b->offset);
memcpy(&((*root)->local_offset.rank), b->buff b->offset,
sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64((*root)->local_offset.rank);
}
@@ -1520,8 1525,8 @@
switch (c)
{
case adios_characteristic_offset:
- var_header->characteristics.offset = *(uint64_t *)
- (b->buff b->offset);
memcpy(&var_header->characteristics.offset,
b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(var_header->characteristics.offset);
}
@@ -1529,8 1534,8 @@
break;
case adios_characteristic_payload_offset:
- var_header->characteristics.payload_offset = *(uint64_t *)
- (b->buff b->offset);
memcpy(&var_header->characteristics.payload_offset,
b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(var_header->characteristics.payload_offset);
}
@@ -1955,7 1960,7 @@
}
b->offset = 4;
- attrs_header->length = *(uint64_t *) (b->buff b->offset);
memcpy(&attrs_header->length, b->buff b->offset, sizeof(uint64_t));
if(b->change_endianness == adios_flag_yes) {
swap_64(attrs_header->length);
}
Index: adios-1.13.1/src/core/bp_utils.c
===================================================================
--- adios-1.13.1.orig/src/core/bp_utils.c
adios-1.13.1/src/core/bp_utils.c
@@ -51,7 51,7 @@
swap_32(var); \
b->offset = 4;
-#define BUFREAD64(b,var) var = *(uint64_t *) (b->buff b->offset); \
#define BUFREAD64(b,var) memcpy(&(var), b->buff b->offset, sizeof(uint64_t));\
if (b->change_endianness == adios_flag_yes) \
swap_64(var); \
b->offset = 8;
|