1189736 - Port Bug 1189156 [Don't use enumeration style in hash table SizeOf*() functions ] to comm-central

Status: RESOLVED FIXED

(MailNews Core :: Backend, defect)

Description

[Misak Khachatryan]

Trying to fix this, but can't understand first part of patch. I don't have deep knowledge in this par of code and generally in programming.

Nicolas, can You please suggest the correct way?

Currently patch doesn't compile with this error:

 0:05.35 /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp: In member function ‘virtual size_t nsMsgDatabase::SizeOfExcludingThis(mozilla::MallocSizeOf) const’:
 0:05.35 /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1004:56: error: request for member ‘ConstIter’ in ‘nsMsgDatabase::HeaderHashSizeOf’, which is of non-class type ‘size_t(PLDHashEntryHdr*, mozilla::MallocSizeOf, void*) {aka long unsigned int(PLDHashEntryHdr*, long unsigned int (*)(const void*), void*)}’
 0:05.35        for (auto iter = nsMsgDatabase::HeaderHashSizeOf.ConstIter(); !iter.Done(); iter.Next()) {
 0:05.35                                                         ^
 0:05.35 /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1005:34: error: ‘GlobalNameMapEntry’ does not name a type
 0:05.35          auto entry = static_cast<GlobalNameMapEntry*>(iter.Get());
 0:05.35                                   ^
 0:05.35 /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1005:52: error: expected ‘>’ before ‘*’ token
 0:05.35          auto entry = static_cast<GlobalNameMapEntry*>(iter.Get());
 0:05.35                                                     ^
 0:05.35 /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1005:52: error: expected ‘(’ before ‘*’ token
 0:05.35 /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1005:53: error: expected primary-expression before ‘>’ token
 0:05.35          auto entry = static_cast<GlobalNameMapEntry*>(iter.Get());
 0:05.35                                                      ^
 0:05.35 /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1005:66: error: expected ‘)’ before ‘;’ token
 0:05.35          auto entry = static_cast<GlobalNameMapEntry*>(iter.Get());
 0:05.35                                                                   ^
 0:05.35 /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp: In member function ‘virtual nsresult nsMsgDatabase::GetCachedHits(const char*, nsISimpleEnumerator**)’:
 0:05.35 Warning: -Wunused-variable in /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp: unused variable ‘err’
 0:05.35 /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp:5714:12: warning: unused variable ‘err’ [-Wunused-variable]
 0:05.35    nsresult err = GetSearchResultsTable(aSearchFolderUri, false, getter_AddRefs(table));
 0:05.35             ^
 0:05.35 
 0:05.35 In the directory  /home/misak/workspace/suite-opt/mailnews/db/msgdb/src
 0:05.35 The following command failed to execute properly:
 0:05.35 /usr/bin/ccache c++ -o nsMsgDatabase.o -c -I../../../../dist/stl_wrappers -I../../../../dist/system_wrappers -include /home/misak/workspace/src/mozilla/config/gcc_hidden.h -DSTATIC_EXPORTABLE_JS_API -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -DAB_CD=en-US -DNO_NSPR_10_SUPPORT -I/home/misak/workspace/src/mailnews/db/msgdb/src -I. -I../../../../dist/include -I/home/misak/workspace/suite-opt/dist/include/nspr -I/home/misak/workspace/suite-opt/dist/include/nss -fPIC -DMOZILLA_CLIENT -include ../../../../mozilla-config.h -MD -MP -MF .deps/nsMsgDatabase.o.pp -Wall -Wempty-body -Woverloaded-virtual -Wsign-compare -Wwrite-strings -Wno-invalid-offsetof -Wcast-align -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -std=gnu++0x -pthread -pipe -DNDEBUG -DTRIMMED -freorder-blocks -Os -fomit-frame-pointer /home/misak/workspace/src/mailnews/db/msgdb/src/nsMsgDatabase.cpp
 0:05.35 /home/misak/workspace/src/mozilla/config/rules.mk:958: recipe for target 'nsMsgDatabase.o' failed
 0:05.35 gmake[4]: *** [nsMsgDatabase.o] Error 1
 0:05.35 /home/misak/workspace/src/mozilla/config/recurse.mk:71: recipe for target 'mailnews/db/msgdb/src/target' failed
 0:05.35 gmake[3]: *** [mailnews/db/msgdb/src/target] Error 2
 0:05.35 /home/misak/workspace/src/mozilla/config/recurse.mk:32: recipe for target 'compile' failed
 0:05.35 gmake[2]: *** [compile] Error 2
 0:05.35 /home/misak/workspace/src/mozilla/config/rules.mk:549: recipe for target 'default' failed
 0:05.35 gmake[1]: *** [default] Error 2
 0:05.35 client.mk:404: recipe for target 'build' failed
 0:05.35 gmake: *** [build] Error 2
 0:05.40 856 compiler warnings present.
 0:06.47 ccache (direct) hit rate: 0.0%; (preprocessed) hit rate: 0.0%; miss rate: 100.0%

Comment 2

[Philip Chee]

Attachment: Patch. Compiles and works.

Comment 3

[Joshua Cranmer [:jcranmer]]

Comment on attachment 8641737 [details] [diff] [review]
Patch. Compiles and works.

Review of attachment 8641737 [details] [diff] [review]:
-----------------------------------------------------------------

rs=me

Comment 4

[Ian Neal]

Comment on attachment 8641737 [details] [diff] [review]
Patch. Compiles and works.

Works for me too.

Comment 5

[Philip Chee]

http://hg.mozilla.org/comm-central/rev/85f81472a34c

Comment 6

[Legacy TBPL/Treeherder Robot]

log: https://treeherder.mozilla.org/logviewer.html#?repo=comm-central&job_id=21759
repository: comm-central
start_time: 2015-07-31T10:49:53
who: philip[dot]chee[at]gmail[dot]com
machine: bld-linux64-spot-035
buildname: TB Linux comm-central leak test build
revision: 2a3f11bc96aa

IOError: [Errno 2] No such file or directory: '/usr/local/lib/hgext/bundleclone.py'
/builds/slave/tb-c-cen-lx-d-0000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1004:53: error: 'PL_DHashTableSizeOfIncludingThis' was not declared in this scope
/builds/slave/tb-c-cen-lx-d-0000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1009:20: error: 'PL_DHashTableSizeOfIncludingThis' was not declared in this scope
make[5]: *** [nsMsgDatabase.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [compile] Error 2
make[2]: *** [default] Error 2
make[1]: *** [build] Error 2
make: *** [build] Error 2

Comment 7

[Legacy TBPL/Treeherder Robot]

log: https://treeherder.mozilla.org/logviewer.html#?repo=comm-central&job_id=21753
repository: comm-central
start_time: 2015-07-31T10:50:23
who: philip[dot]chee[at]gmail[dot]com
machine: bld-linux64-spot-005
buildname: TB Linux comm-central build
revision: 2a3f11bc96aa

IOError: [Errno 2] No such file or directory: '/usr/local/lib/hgext/bundleclone.py'
/builds/slave/tb-c-cen-lx-000000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1004:53: error: 'PL_DHashTableSizeOfIncludingThis' was not declared in this scope
/builds/slave/tb-c-cen-lx-000000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1009:20: error: 'PL_DHashTableSizeOfIncludingThis' was not declared in this scope
make[5]: *** [nsMsgDatabase.o] Error 1
make[4]: *** [mailnews/db/msgdb/src/target] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [compile] Error 2
make[2]: *** [default] Error 2
make[1]: *** [build] Error 2
make: *** [build] Error 2

Comment 8

[Legacy TBPL/Treeherder Robot]

log: https://treeherder.mozilla.org/logviewer.html#?repo=comm-central&job_id=21754
repository: comm-central
start_time: 2015-07-31T10:50:16
who: philip[dot]chee[at]gmail[dot]com
machine: bld-linux64-spot-399
buildname: TB Linux x86-64 comm-central build
revision: 2a3f11bc96aa

IOError: [Errno 2] No such file or directory: '/usr/local/lib/hgext/bundleclone.py'
/builds/slave/tb-c-cen-l64-00000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1004:53: error: 'PL_DHashTableSizeOfIncludingThis' was not declared in this scope
/builds/slave/tb-c-cen-l64-00000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1009:20: error: 'PL_DHashTableSizeOfIncludingThis' was not declared in this scope
make[5]: *** [nsMsgDatabase.o] Error 1
make[4]: *** [mailnews/db/msgdb/src/target] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [compile] Error 2
make[2]: *** [default] Error 2
make[1]: *** [build] Error 2
make: *** [build] Error 2

Comment 9

[Legacy TBPL/Treeherder Robot]

log: https://treeherder.mozilla.org/logviewer.html#?repo=comm-central&job_id=21755
repository: comm-central
start_time: 2015-07-31T10:50:40
who: philip[dot]chee[at]gmail[dot]com
machine: bld-linux64-spot-130
buildname: TB Linux x86-64 comm-central leak test build
revision: 2a3f11bc96aa

IOError: [Errno 2] No such file or directory: '/usr/local/lib/hgext/bundleclone.py'
/builds/slave/tb-c-cen-l64-d-000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1004:53: error: 'PL_DHashTableSizeOfIncludingThis' was not declared in this scope
/builds/slave/tb-c-cen-l64-d-000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1009:20: error: 'PL_DHashTableSizeOfIncludingThis' was not declared in this scope
make[5]: *** [nsMsgDatabase.o] Error 1
make[5]: *** Waiting for unfinished jobs....
make[4]: *** [mailnews/db/msgdb/src/target] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [compile] Error 2
make[2]: *** [default] Error 2
make[1]: *** [build] Error 2
make: *** [build] Error 2

Comment 10

[Legacy TBPL/Treeherder Robot]

log: https://treeherder.mozilla.org/logviewer.html#?repo=comm-central&job_id=21761
repository: comm-central
start_time: 2015-07-31T10:49:40
who: philip[dot]chee[at]gmail[dot]com
machine: b-2008-ix-0120
buildname: TB WINNT 5.2 comm-central leak test build
revision: 2a3f11bc96aa

CalledProcessError: Command '['hg', 'log', '-r', u'2a3f11bc96aa349f4e472a40e38fe2404a860ceb', '--template', '{node}']' returned non-zero exit status 255
c:/builds/moz2_slave/tb-c-cen-w32-d-000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp(1003) : error C3861: 'PL_DHashTableSizeOfIncludingThis': identifier not found
c:/builds/moz2_slave/tb-c-cen-w32-d-000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp(1008) : error C3861: 'PL_DHashTableSizeOfIncludingThis': identifier not found
mozmake.exe[5]: *** [nsMsgDatabase.obj] Error 2
mozmake.exe[4]: *** [mailnews/db/msgdb/src/target] Error 2
mozmake.exe[4]: *** Waiting for unfinished jobs....
mozmake.exe[3]: *** [compile] Error 2
mozmake.exe[2]: *** [default] Error 2
mozmake.exe[1]: *** [build] Error 2
mozmake.exe: *** [build] Error 2

Comment 11

[Legacy TBPL/Treeherder Robot]

log: https://treeherder.mozilla.org/logviewer.html#?repo=comm-central&job_id=21758
repository: comm-central
start_time: 2015-07-31T10:49:40
who: philip[dot]chee[at]gmail[dot]com
machine: bld-lion-r5-061
buildname: TB OS X 10.7 64-bit comm-central leak test build
revision: 2a3f11bc96aa

CalledProcessError: Command '['hg', 'log', '-r', u'2a3f11bc96aa349f4e472a40e38fe2404a860ceb', '--template', '{node}']' returned non-zero exit status 255
/builds/slave/tb-c-cen-m64-d-000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1003:18: error: use of undeclared identifier 'PL_DHashTableSizeOfIncludingThis'
/builds/slave/tb-c-cen-m64-d-000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1008:18: error: use of undeclared identifier 'PL_DHashTableSizeOfIncludingThis'
make[5]: *** [nsMsgDatabase.o] Error 1
make[4]: *** [mailnews/db/msgdb/src/target] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [compile] Error 2
make[2]: *** [default] Error 2
make[1]: *** [build] Error 2
make: *** [build] Error 2

Comment 12

[Legacy TBPL/Treeherder Robot]

log: https://treeherder.mozilla.org/logviewer.html#?repo=comm-central&job_id=21756
repository: comm-central
start_time: 2015-07-31T10:49:40
who: philip[dot]chee[at]gmail[dot]com
machine: b-2008-ix-0077
buildname: TB WINNT 5.2 comm-central build
revision: 2a3f11bc96aa

CalledProcessError: Command '['hg', 'log', '-r', u'2a3f11bc96aa349f4e472a40e38fe2404a860ceb', '--template', '{node}']' returned non-zero exit status 255
c:/builds/moz2_slave/tb-c-cen-w32-00000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp(1003) : error C3861: 'PL_DHashTableSizeOfIncludingThis': identifier not found
c:/builds/moz2_slave/tb-c-cen-w32-00000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp(1008) : error C3861: 'PL_DHashTableSizeOfIncludingThis': identifier not found
mozmake.exe[5]: *** [nsMsgDatabase.obj] Error 2
mozmake.exe[4]: *** [mailnews/db/msgdb/src/target] Error 2
mozmake.exe[4]: *** Waiting for unfinished jobs....
mozmake.exe[3]: *** [compile] Error 2
mozmake.exe[2]: *** [default] Error 2
mozmake.exe[1]: *** [build] Error 2
mozmake.exe: *** [build] Error 2

Comment 13

[Legacy TBPL/Treeherder Robot]

log: https://treeherder.mozilla.org/logviewer.html#?repo=comm-central&job_id=21760
repository: comm-central
start_time: 2015-07-31T10:49:40
who: philip[dot]chee[at]gmail[dot]com
machine: bld-lion-r5-094
buildname: TB OS X 10.7 comm-central build
revision: 2a3f11bc96aa

CalledProcessError: Command '['hg', 'log', '-r', u'2a3f11bc96aa349f4e472a40e38fe2404a860ceb', '--template', '{node}']' returned non-zero exit status 255
/builds/slave/tb-c-cen-m64-00000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1003:18: error: use of undeclared identifier 'PL_DHashTableSizeOfIncludingThis'
/builds/slave/tb-c-cen-m64-00000000000000000/build/mailnews/db/msgdb/src/nsMsgDatabase.cpp:1008:18: error: use of undeclared identifier 'PL_DHashTableSizeOfIncludingThis'
make[6]: *** [nsMsgDatabase.o] Error 1
make[5]: *** [mailnews/db/msgdb/src/target] Error 2
make[5]: *** Waiting for unfinished jobs....
make[4]: *** [compile] Error 2
make[3]: *** [default] Error 2
make[2]: *** [build] Error 2
make[1]: *** [build] Error 2
make: *** [build] Error 2