Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
binwalk
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fact-gitdep
binwalk
Commits
35d5b776
Commit
35d5b776
authored
Dec 07, 2015
by
Craig Heffner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed multi-process hack from the entropy module.
parent
a450bdf6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
18 deletions
+7
-18
entropy.py
src/binwalk/modules/entropy.py
+7
-18
No files found.
src/binwalk/modules/entropy.py
View file @
35d5b776
...
...
@@ -3,7 +3,6 @@
import
os
import
math
import
zlib
import
multiprocessing
import
binwalk.core.common
from
binwalk.core.compat
import
*
from
binwalk.core.module
import
Module
,
Option
,
Kwarg
...
...
@@ -113,24 +112,14 @@ class Entropy(Module):
else
:
self
.
block_size
=
None
def
_entropy_sigterm_handler
(
self
,
*
args
):
print
(
"FUck it all."
)
def
run
(
self
):
# Need to invoke the pyqtgraph stuff via a separate process, as calling pg.exit
# is pretty much required. pg.exit calls os._exit though, and we don't want to
# exit out of the main process (especially if being run via the API).
#
# TODO: This is a nasty hack. Find a better way. Until then, just know that
# pg.exit will quite the current process.
if
False
:
#not binwalk.core.common.MSWindows():
p
=
multiprocessing
.
Process
(
target
=
self
.
_run
)
p
.
start
()
p
.
join
()
else
:
# There seem to be all kinds of issues using the multiprocessing module in
# Windows, as done above.
#
# This means that when run in Windows, pg.exit will cause binwalk
# to exit.
self
.
_run
()
# If generating a graphical plot, this function will never return, as it invokes
# pg.exit. Calling pg.exit is pretty much required, but pg.exit calls os._exit in
# order to work around QT cleanup issues.
self
.
_run
()
def
_run
(
self
):
# Sanity check and warning if pyqtgraph isn't found
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment