Skip to content

Better waitEvents implementation for *nix-like systems #78

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.

Sign up for GitHub

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

Closed
graynk wants to merge 7 commits into from
Closed

Better waitEvents implementation for *nix-like systems #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f8f07b
a kinda-sorta fix for inefficient sleeping in a loop in waitEvents
graynk Oct 3, 2019
08b1cc6
Merge remote-tracking branch 'upstream/master'
Jan 30, 2021
8d462e2
recompiled latest .so after merge
Jan 30, 2021
82ed9ab
Revert binary
graynk Feb 7, 2021
5639de0
don't try to use poll on Mac OS
graynk Feb 7, 2021
20c2d58
binary had different permissions
graynk Feb 7, 2021
1dcd974
use existing flags
graynk Feb 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/cpp/_nix_based/jssc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
#endif
#ifdef __APPLE__
#include <serial/ioss.h>//Needed for IOSSIOSPEED in Mac OS X (Non standard baudrate)
#else
#include <poll.h> // poll.h is not defined on older Mac OS systems
#endif

#include <jni.h>
Expand Down Expand Up @@ -722,6 +724,10 @@ JNIEXPORT jobjectArray JNICALL Java_jssc_SerialNativeInterface_waitEvents

jclass intClass = env->FindClass("[I");
jobjectArray returnArray = env->NewObjectArray(sizeof(events)/sizeof(jint), intClass, NULL);
#ifdef POLLIN
struct pollfd waitingSet = { static_cast<int>(portHandle), POLLIN, 0 };
poll(&waitingSet, 1, 1000);
#endif

/*Input buffer*/
jint bytesCountIn = 0;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/jssc/SerialPort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ public class SerialPort {
private static final int PARAMS_FLAG_PARMRK = 2;
//<- since 2.6.0

private static final boolean isMac = SerialNativeInterface.getOsType() == SerialNativeInterface.OS_MAC_OS_X;

public SerialPort(String portName) {
this.portName = portName;
serialInterface = new SerialNativeInterface();
Expand Down Expand Up @@ -1301,6 +1303,8 @@ public void run() {
}
}
}
if (!isMac) continue;

//Need to sleep some time
try {
Thread.sleep(0, 100);
Expand Down