Demande d'ameliorations d'une classe!

Bonjour !
Merci aux gens du chat qui m'ont aidé pour cette classe.
Sont but, pouvoir lire un char* qui est composé de byte en hexadecimal separés par un espace.
ET inversement, de pouvoir ecrire un short/int/long long/string (pour pouvoir le renvoyer sur le socket en fait :D)


Voici le header:

Code:

---

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 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392

#ifndef PACKET_H #define PACKET_H     #include <string.h> #include <string>   #include <iostream> #include <stdlib.h>   using namespace std;   class Packet { public: Packet() : // ecriture packetwrite("00 00") { init_s2h(); } Packet(char* buffer) : // lecture packet(buffer), pos(0), length(strlen(buffer)) { init_s2h(); } virtual ~Packet() { delete packet; }   // read functions const unsigned short ReadShort(); const unsigned int ReadInt(); const unsigned long long ReadLong(); const string& ReadString(unsigned short len);   // write functions template<typename T> void writeNumber(const T n) { // first, we add a space to the packet packetwrite += " "; char* tmp = new char; xtoa(n, tmp, 16); int c = 0, d = (strlen(tmp)%2==0)?0:1; // in case tmp has 3 or 4 chars, we need a 0 in front of it if(d == 1) packetwrite += "0"; while(c < strlen(tmp)) { if(d == 2) { packetwrite += " "; d = 0; } else { packetwrite += tmp[c]; ++c; ++d; } } free(tmp); } void writeString(const string& s); void reset();   const char* getPacket(); void Skip() { pos += 3; }   protected: private: char* packet; string packetwrite; int pos; int length;   char s2h[256][2];   void init_s2h() { s2h[0] = {'0','0'}; s2h[1] = {'0','1'}; s2h[2] = {'0','2'}; s2h[3] = {'0','3'}; s2h[4] = {'0','4'}; s2h[5] = {'0','5'}; s2h[6] = {'0','6'}; s2h[7] = {'0','7'}; s2h[8] = {'0','8'}; s2h[9] = {'0','9'}; s2h[10] = {'0','A'}; s2h[11] = {'0','B'}; s2h[12] = {'0','C'}; s2h[13] = {'0','D'}; s2h[14] = {'0','E'}; s2h[15] = {'0','F'}; s2h[16] = {'1','0'}; s2h[17] = {'1','1'}; s2h[18] = {'1','2'}; s2h[19] = {'1','3'}; s2h[20] = {'1','4'}; s2h[21] = {'1','5'}; s2h[22] = {'1','6'}; s2h[23] = {'1','7'}; s2h[24] = {'1','8'}; s2h[25] = {'1','9'}; s2h[26] = {'1','A'}; s2h[27] = {'1','B'}; s2h[28] = {'1','C'}; s2h[29] = {'1','D'}; s2h[30] = {'1','E'}; s2h[31] = {'1','F'}; s2h[32] = {'2','0'}; s2h[33] = {'2','1'}; s2h[34] = {'2','2'}; s2h[35] = {'2','3'}; s2h[36] = {'2','4'}; s2h[37] = {'2','5'}; s2h[38] = {'2','6'}; s2h[39] = {'2','7'}; s2h[40] = {'2','8'}; s2h[41] = {'2','9'}; s2h[42] = {'2','A'}; s2h[43] = {'2','B'}; s2h[44] = {'2','C'}; s2h[45] = {'2','D'}; s2h[46] = {'2','E'}; s2h[47] = {'2','F'}; s2h[48] = {'3','0'}; s2h[49] = {'3','1'}; s2h[50] = {'3','2'}; s2h[51] = {'3','3'}; s2h[52] = {'3','4'}; s2h[53] = {'3','5'}; s2h[54] = {'3','6'}; s2h[55] = {'3','7'}; s2h[56] = {'3','8'}; s2h[57] = {'3','9'}; s2h[58] = {'3','A'}; s2h[59] = {'3','B'}; s2h[60] = {'3','C'}; s2h[61] = {'3','D'}; s2h[62] = {'3','E'}; s2h[63] = {'3','F'}; s2h[64] = {'4','0'}; s2h[65] = {'4','1'}; s2h[66] = {'4','2'}; s2h[67] = {'4','3'}; s2h[68] = {'4','4'}; s2h[69] = {'4','5'}; s2h[70] = {'4','6'}; s2h[71] = {'4','7'}; s2h[72] = {'4','8'}; s2h[73] = {'4','9'}; s2h[74] = {'4','A'}; s2h[75] = {'4','B'}; s2h[76] = {'4','C'}; s2h[77] = {'4','D'}; s2h[78] = {'4','E'}; s2h[79] = {'4','F'}; s2h[80] = {'5','0'}; s2h[81] = {'5','1'}; s2h[82] = {'5','2'}; s2h[83] = {'5','3'}; s2h[84] = {'5','4'}; s2h[85] = {'5','5'}; s2h[86] = {'5','6'}; s2h[87] = {'5','7'}; s2h[88] = {'5','8'}; s2h[89] = {'5','9'}; s2h[90] = {'5','A'}; s2h[91] = {'5','B'}; s2h[92] = {'5','C'}; s2h[93] = {'5','D'}; s2h[94] = {'5','E'}; s2h[95] = {'5','F'}; s2h[96] = {'6','0'}; s2h[97] = {'6','1'}; s2h[98] = {'6','2'}; s2h[99] = {'6','3'}; s2h[100] = {'6','4'}; s2h[101] = {'6','5'}; s2h[102] = {'6','6'}; s2h[103] = {'6','7'}; s2h[104] = {'6','8'}; s2h[105] = {'6','9'}; s2h[106] = {'6','A'}; s2h[107] = {'6','B'}; s2h[108] = {'6','C'}; s2h[109] = {'6','D'}; s2h[110] = {'6','E'}; s2h[111] = {'6','F'}; s2h[112] = {'7','0'}; s2h[113] = {'7','1'}; s2h[114] = {'7','2'}; s2h[115] = {'7','3'}; s2h[116] = {'7','4'}; s2h[117] = {'7','5'}; s2h[118] = {'7','6'}; s2h[119] = {'7','7'}; s2h[120] = {'7','8'}; s2h[121] = {'7','9'}; s2h[122] = {'7','A'}; s2h[123] = {'7','B'}; s2h[124] = {'7','C'}; s2h[125] = {'7','D'}; s2h[126] = {'7','E'}; s2h[127] = {'7','F'}; s2h[128] = {'8','0'}; s2h[129] = {'8','1'}; s2h[130] = {'8','2'}; s2h[131] = {'8','3'}; s2h[132] = {'8','4'}; s2h[133] = {'8','5'}; s2h[134] = {'8','6'}; s2h[135] = {'8','7'}; s2h[136] = {'8','8'}; s2h[137] = {'8','9'}; s2h[138] = {'8','A'}; s2h[139] = {'8','B'}; s2h[140] = {'8','C'}; s2h[141] = {'8','D'}; s2h[142] = {'8','E'}; s2h[143] = {'8','F'}; s2h[144] = {'9','0'}; s2h[145] = {'9','1'}; s2h[146] = {'9','2'}; s2h[147] = {'9','3'}; s2h[148] = {'9','4'}; s2h[149] = {'9','5'}; s2h[150] = {'9','6'}; s2h[151] = {'9','7'}; s2h[152] = {'9','8'}; s2h[153] = {'9','9'}; s2h[154] = {'9','A'}; s2h[155] = {'9','B'}; s2h[156] = {'9','C'}; s2h[157] = {'9','D'}; s2h[158] = {'9','E'}; s2h[159] = {'9','F'}; s2h[160] = {'0','A'}; s2h[161] = {'1','A'}; s2h[162] = {'2','A'}; s2h[163] = {'3','A'}; s2h[164] = {'4','A'}; s2h[165] = {'5','A'}; s2h[166] = {'6','A'}; s2h[167] = {'7','A'}; s2h[168] = {'8','A'}; s2h[169] = {'9','A'}; s2h[170] = {'A','A'}; s2h[171] = {'B','A'}; s2h[172] = {'C','A'}; s2h[173] = {'D','A'}; s2h[174] = {'E','A'}; s2h[175] = {'F','A'}; s2h[176] = {'0','B'}; s2h[177] = {'1','B'}; s2h[178] = {'2','B'}; s2h[179] = {'3','B'}; s2h[180] = {'4','B'}; s2h[181] = {'5','B'}; s2h[182] = {'6','B'}; s2h[183] = {'7','B'}; s2h[184] = {'8','B'}; s2h[185] = {'9','B'}; s2h[186] = {'A','B'}; s2h[187] = {'B','B'}; s2h[188] = {'C','B'}; s2h[189] = {'D','B'}; s2h[190] = {'E','B'}; s2h[191] = {'F','B'}; s2h[192] = {'0','C'}; s2h[193] = {'1','C'}; s2h[194] = {'2','C'}; s2h[195] = {'3','C'}; s2h[196] = {'4','C'}; s2h[197] = {'5','C'}; s2h[198] = {'6','C'}; s2h[199] = {'7','C'}; s2h[200] = {'8','C'}; s2h[201] = {'9','C'}; s2h[202] = {'A','C'}; s2h[203] = {'B','C'}; s2h[204] = {'C','C'}; s2h[205] = {'D','C'}; s2h[206] = {'E','C'}; s2h[207] = {'F','C'}; s2h[208] = {'0','D'}; s2h[209] = {'1','D'}; s2h[210] = {'2','D'}; s2h[211] = {'3','D'}; s2h[212] = {'4','D'}; s2h[213] = {'5','D'}; s2h[214] = {'6','D'}; s2h[215] = {'7','D'}; s2h[216] = {'8','D'}; s2h[217] = {'9','D'}; s2h[218] = {'A','D'}; s2h[219] = {'B','D'}; s2h[220] = {'C','D'}; s2h[221] = {'D','D'}; s2h[222] = {'E','D'}; s2h[223] = {'F','D'}; s2h[224] = {'0','E'}; s2h[225] = {'1','E'}; s2h[226] = {'2','E'}; s2h[227] = {'3','E'}; s2h[228] = {'4','E'}; s2h[229] = {'5','E'}; s2h[230] = {'6','E'}; s2h[231] = {'7','E'}; s2h[232] = {'8','E'}; s2h[233] = {'9','E'}; s2h[234] = {'A','E'}; s2h[235] = {'B','E'}; s2h[236] = {'C','E'}; s2h[237] = {'D','E'}; s2h[238] = {'E','E'}; s2h[239] = {'F','E'}; s2h[240] = {'0','F'}; s2h[241] = {'1','F'}; s2h[242] = {'2','F'}; s2h[243] = {'3','F'}; s2h[244] = {'4','F'}; s2h[245] = {'5','F'}; s2h[246] = {'6','F'}; s2h[247] = {'7','F'}; s2h[248] = {'8','F'}; s2h[249] = {'9','F'}; s2h[250] = {'A','F'}; s2h[251] = {'B','F'}; s2h[252] = {'C','F'}; s2h[253] = {'D','F'}; s2h[254] = {'E','F'}; s2h[255] = {'F','F'}; }   };   inline unsigned short htos(char h, int shift) { switch(h) { case 'a': case 'A': return 10 << shift; break; case 'b': case 'B': return 11 << shift; break; case 'c': case 'C': return 12 << shift; break; case 'd': case 'D': return 13 << shift; break; case 'e': case 'E': return 14 << shift; break; case 'f': case 'F': return 15 << shift; break; default: return (h-'0') << shift; break; } } template<typename T> const char* xtoa(T value, char* result, int base) { if (base < 2 || base > 36) { *result = '\0'; return result; } char* ptr = result, *ptr1 = result, tmp_char; T tmp_value; do { tmp_value = value; value /= base; *ptr++ = "zyxwvutsrqponmlkjihgfedcba9876543210123456789abcdefghijklmnopqrstuvwxyz" [35 + (tmp_value - value * base)]; } while ( value );   *ptr-- = '\0'; while(ptr1 < ptr) { tmp_char = *ptr; *ptr--= *ptr1; *ptr1++ = tmp_char; } free(ptr); free(ptr1); free(tmp_char); return result; }   #endif // PACKET_H

---

Voici le cpp:

Code:

---

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

#include "Packet.h"   const unsigned short Packet::ReadShort() { unsigned short b = static_cast<unsigned short>((htos(packet[pos], 4) | htos(packet[pos+1], 0)) & 0xff); Skip(); return b; } const unsigned int Packet::ReadInt() { return static_cast<int>(((ReadShort() << 8) & 0xffff) | ReadShort()); } const unsigned long long Packet::ReadLong() { return static_cast<long long>(((ReadInt() << 16) & 0xffffffff) | ReadInt()); } const string& Packet::ReadString(unsigned short len) { if(pos + (len*2 + (len-1)) > strlen(packet)) { //exit(0); // cela ne devrait jamais arriver. } string out; for(int i = 0; i < length; ++i) { out += char(((htos(packet[pos], 4) | htos(packet[pos+1], 0)) & 0xff)); Skip(); } return out; }   void Packet::writeString(const string& s) { int i = 0, e = 0; char* tmp = (char*)calloc(s.size()*2+s.size()-1, sizeof(char)); while(i < s.size()) { tmp[e] = ' '; ++e; tmp[e] = s2h[((s[i] << 4) & 0xff)][0]; ++e; tmp[e] = s2h[((s[i] << 4) & 0xff)][1]; ++e; ++i; } packetwrite += tmp; free(tmp); } const char* Packet::getPacket() { int packetLength = packetwrite.size()-6; // cause the packet size header (00 00 ) = 6 char* header = (char*)calloc(5, sizeof(char)); xtoa(packetLength, header, 16); // transforming into hex // updating header switch(strlen(header)) { case 1: { packetwrite[4] = header[0]; break; } case 2: { packetwrite[3] = header[0]; packetwrite[4] = header[1]; break; } case 3: { packetwrite[1] = header[0]; packetwrite[3] = header[1]; packetwrite[4] = header[2]; break; } case 4: { packetwrite[0] = header[0]; packetwrite[1] = header[1]; packetwrite[3] = header[2]; packetwrite[4] = header[3]; break; } } free(header); return packetwrite.c_str(); }

---

L'important de cette classe est la rapidité d'éxécution, c'est primordial pour la bonne tenue du programme qui va devoir l'utiliser !
Si vous avez des commentaires et/ou améliorations, je suis grandement preneur !

notes:
Quand on construit en lecture, on ne sait PAS a l'avance ce que contient le packet.
Donc les fonctions de lecture offrent une tres grande flexibilité

getPacket():
- il va retourner la taille du packet suivi du packet.
donc un packet de un byte, il va retourner:
00 01 XX

La fonction xtoa parait vraiment etrange, pourtant je l'ai chopée sur un site ou il comparaient 5 facons de faire un itoa(), et celle la etait la plus rapide !

Voila!
merci, nico.

Salut,

J'ai failli faire une crise cardiaque quand j'ai lu ta fonction "init_s2h". Tu as perdu un temps bête, alors que tu aurais pu le faire en 15 secondes en réfléchissant 1 minute de plus:

Code:

---

1 2 3 4 5 6 7

void init_s2h() { const char l[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; for(int i=0; i < 16; ++i) for(int j=0; j < 16; ++j) s2h[i*16 + j] = {l[i], l[j]}; }

---

Ensuite dans "ReadString" (et entre (), on ne met pas de majuscule au nom de méthode), tu retournes une référence vers un objet local à la fonction, ça segfaultera à un moment ou un autre...

Pour xtoa, j'espère que result est bien alloué avant l'appel, et quand bien même tu ne sais pas vraiment quelle taille tu dois allouer... Utilise un string passé en référence, ça sera plus sur.

Pour htos:

Code:

---

1 2 3 4 5 6 7 8 9

inline unsigned short htos(char h, int shift) { if(h >= 'a' && h <= 'f') { char c = tolower(h); return (c-'a'+10) << shift; } return (h-'0') << shift; }

---

Pour ce qui est des optimisations que tu essayes de faire sur ton code c'est bien souvent en vain car le compilateur les fait lui-même: compile avec l'option "-O3" et compare mais généralement tu ne verras aucunes différences entre tes deux versions si elles ont la même complexité.

De toutes façons je présume que tu lis tes paquets et vu que c'est une entrée-sortie, c'est toujours ça qui prendra le plus de temps...