-
Notifications
You must be signed in to change notification settings - Fork 472
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
Transfer TUI Code to Dev Branch #1605
Merged
Merged
Changes from 10 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
40087ac
Update worker thread for server creation
pwang00 326aea1
Add necessary files for TUI connectivity
pwang00 060441e
Add necessary files for TUI connectivity
pwang00 8174959
Update MonitorWorker
pwang00 fa15efe
Update protocol
pwang00 93d8604
Blacken
7cf8752
Update setup.py dependencies
pwang00 946c916
Merge branch 'master' of https://github.com/pwang00/manticore
pwang00 3d8dbde
Remove state debugging messages
pwang00 3a4f8db
Update setup.py to build protobuf protocol upon install
pwang00 9da250d
Remove previously generated state_pb2.py
pwang00 ccf497a
Change subprocess.Popen to subprocess.check_output
pwang00 b0ac3f3
Remove extraneous output
pwang00 e9bfda6
Merge branch 'master' into pr/1605
577fce4
First attempt at fixing protobuf installation
6eb5e6b
Can't forget the f-string
eed5d9f
Error on missing protoc
1a4ab87
Disable auto-generation of protobuf file
8880d7a
Ignore pb2_errors
6d05808
Disable monitor start
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
syntax = "proto3"; | ||
|
||
package mserialize; | ||
|
||
message LogMessage{ | ||
string content = 1; | ||
} | ||
|
||
message State{ | ||
|
||
enum StateType{ | ||
READY = 0; | ||
BUSY = 1; | ||
KILLED = 2; | ||
TERMINATED = 3; | ||
} | ||
|
||
int32 id = 2; // state ID | ||
StateType type = 3; // Type of state | ||
string reason = 4; // Reason for execution stopping | ||
int32 num_executing = 5; // number of executing instructions | ||
int32 wait_time = 6; | ||
} | ||
|
||
message StateList{ | ||
repeated State states = 7; | ||
} | ||
|
||
message MessageList{ | ||
repeated LogMessage messages = 8; | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like some dangling whitespace made it in here somehow?