Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Side by Side Diff: src/profile-generator.h

Issue 5328001: Fix again HeapEntry size problem, now platform-independent way. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/profile-generator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 unsigned type_: 3; 608 unsigned type_: 3;
609 int children_count_: 27; 609 int children_count_: 27;
610 int retainers_count_; 610 int retainers_count_;
611 int self_size_; 611 int self_size_;
612 union { 612 union {
613 int ordered_index_; // Used during dominator tree building. 613 int ordered_index_; // Used during dominator tree building.
614 int retained_size_; // At that moment, there is no retained size yet. 614 int retained_size_; // At that moment, there is no retained size yet.
615 }; 615 };
616 HeapEntry* dominator_; 616 HeapEntry* dominator_;
617 HeapSnapshot* snapshot_; 617 HeapSnapshot* snapshot_;
618 #ifdef WIN32
619 struct Id { 618 struct Id {
620 uint32_t id1_; 619 uint32_t id1_;
621 uint32_t id2_; 620 uint32_t id2_;
622 } id_; // This is to avoid extra padding of 64-bit value on MSVC. 621 } id_; // This is to avoid extra padding of 64-bit value.
623 #else
624 uint64_t id_;
625 #endif
626 const char* name_; 622 const char* name_;
627 623
628 // Paints used for exact retained sizes calculation. 624 // Paints used for exact retained sizes calculation.
629 static const unsigned kUnpainted = 0; 625 static const unsigned kUnpainted = 0;
630 static const unsigned kPainted = 1; 626 static const unsigned kPainted = 1;
631 static const unsigned kPaintedReachableFromOthers = 2; 627 static const unsigned kPaintedReachableFromOthers = 2;
632 // Paints used for approximate retained sizes calculation. 628 // Paints used for approximate retained sizes calculation.
633 static const unsigned kLeaf = 0; 629 static const unsigned kLeaf = 0;
634 static const unsigned kNonLeaf = 1; 630 static const unsigned kNonLeaf = 1;
635 static const unsigned kProcessed = 2; 631 static const unsigned kProcessed = 2;
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 friend class HeapSnapshotJSONSerializerIterator; 1070 friend class HeapSnapshotJSONSerializerIterator;
1075 1071
1076 DISALLOW_COPY_AND_ASSIGN(HeapSnapshotJSONSerializer); 1072 DISALLOW_COPY_AND_ASSIGN(HeapSnapshotJSONSerializer);
1077 }; 1073 };
1078 1074
1079 } } // namespace v8::internal 1075 } } // namespace v8::internal
1080 1076
1081 #endif // ENABLE_LOGGING_AND_PROFILING 1077 #endif // ENABLE_LOGGING_AND_PROFILING
1082 1078
1083 #endif // V8_PROFILE_GENERATOR_H_ 1079 #endif // V8_PROFILE_GENERATOR_H_
OLDNEW
« no previous file with comments | « no previous file | src/profile-generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698