Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-20188 Fix 3 memory leaks #11915

Merged
merged 1 commit into from Nov 28, 2018

Conversation

Projects
None yet
6 participants
@wangkx
Copy link
Member

commented Nov 13, 2018

Signed-off-by: wangkx kevin.wang@lexisnexis.com

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Testing:

HPCC-20188 Fix 3 memory leaks
Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
@hpcc-jirabot

This comment has been minimized.

Copy link

commented Nov 13, 2018

@wangkx

This comment has been minimized.

Copy link
Member Author

commented Nov 13, 2018

@mckellyln please review.

@@ -6239,6 +6239,13 @@ class CMemoryMappedFile: implements IMemoryMappedFile, public CInterface
CloseHandle(hfile);

This comment has been minimized.

Copy link
@mckellyln

mckellyln Nov 20, 2018

Contributor

Just to be consistent, for WIN32, is UnmapViewOfFile() needed here or is it enough to CloseHandle(hmap) ?

This comment has been minimized.

Copy link
@richardkchapman

richardkchapman Nov 23, 2018

Member

@ghalliday Can you comment?

This comment has been minimized.

Copy link
@ghalliday

ghalliday Nov 26, 2018

Member

Good thinking, I think you are correct . From the documentation:

"Mapped views of a file mapping object maintain internal references to the object, and a file mapping object does not close until all references to it are released. Therefore, to fully close a file mapping object, an application must unmap all mapped views of the file mapping object by calling UnmapViewOfFile and close the file mapping object handle by calling CloseHandle. These functions can be called in any order."

the same goes for the existing code in reinit() on line 6308.

@wangkx

@mckellyln

This comment has been minimized.

Copy link
Contributor

commented Nov 20, 2018

@wangkx did you see these regions being released in valgrind output ?
Could you attach some before/after valgrind output here ?

@richardkchapman richardkchapman changed the base branch from candidate-7.0.2 to candidate-7.0.4 Nov 23, 2018

@HPCCSmoketest

This comment has been minimized.

Copy link
Contributor

commented Nov 23, 2018

Automated Smoketest:
OS: centos 7.4.1708 (Linux 3.10.0-327.28.3.el7.x86_64)
Sha: 0ba3c64
Build: success
Build: success
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 95 95 0 0 0
wutoolTest(Dali) 19 19 0 0 0
wutoolTest(Cassandra) 19 19 0 0 0

Regression test result:

phase total pass fail
setup (hthor) 11 11 0
setup (thor) 11 11 0
setup (roxie) 11 11 0
test (hthor) 808 808 0
test (thor) 732 732 0
test (roxie) 881 881 0

HPCC Stop: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
10 sec (00:00:10) 185 sec (00:03:05) 0 sec (00:00:00) 2 sec (00:00:02) 18 sec (00:00:18) 1477 sec (00:24:37) 18 sec (00:00:18) 1710 sec (00:28:30)
@mckellyln
Copy link
Contributor

left a comment

I approve this change, provided we create a new JIRA for the Windows fix of calling UnmapViewOfFile()

@mckellyln

This comment has been minimized.

@mckellyln

This comment has been minimized.

Copy link
Contributor

commented Nov 28, 2018

@richardkchapman richardkchapman merged commit 49ba2f0 into hpcc-systems:candidate-7.0.4 Nov 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.