Fix #56, undo RepyV1 uniqueid patch #194
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `uniqueid` module had a bug when "imported" with the RepyV1 preprocessor, `repypp`. (That program had no notion of modules already imported, so it would paste multiple copies of imported libraries and thus cause duplicate IDs with the `uniqueid` module). This bug was patched for V1, but the patch never removed since. In RepyV2, `dylink` is used to import modules, and it does a much better job at importing modules only once, see for instance SeattleTestbed#55. Therefore, we can remove the old patch! To verify that removing the patch is safe, I also added a unit test that checks `uniqueid`'s * basic functionality, * functioning after reimport, and * function across threads.
lukpueh
reviewed
Sep 6, 2017
|
|
||
| current_time = getruntime() | ||
| uniqueid_idlist = [int((current_time - int(current_time)) * 2**32)] | ||
| uniqueid_idlist = [0] |
There was a problem hiding this comment.
Why exactly does this have to be a list? It will always only hold one element, right?
|
|
||
| uniqueid2 = dy_import_module("uniqueid.r2py") | ||
|
|
||
| assert uniqueid2.uniqueid_getid() != uniqueid.uniqueid_getid(), "Got the same ID twice after pseudo-reimporting!" |
There was a problem hiding this comment.
Should we also verify that uniqueid2 does not return an id that was already returned by uniqueid, i.e.
assert uniqueid2.uniqueid_getid() not in oldids to catch the case that the new import resets the module store.
| sleep(5) | ||
|
|
||
| for anid in idlist: | ||
| assert idlist.count(anid)==1, "Duplicate ID: " + str(anid) |
There was a problem hiding this comment.
idlist.count(anid) == 1 (whitespaces)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
uniqueidmodule had a bug when "imported" with the RepyV1preprocessor,
repypp. (That program had no notion of modules alreadyimported, so it would paste multiple copies of imported libraries
and thus cause duplicate IDs with the
uniqueidmodule). This bugwas patched for V1, but the patch never removed since.
In RepyV2,
dylinkis used to import modules, and it does a muchbetter job at importing modules only once, see for instance
#55. Therefore, we can remove the old
patch!
To verify that removing the patch is safe, I also added a unit test
that checks
uniqueid's