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.

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

Jump to bottom

Merge 5 -> 6 #268

Merged
merged 6 commits into from
Aug 2, 2024
Merged

Merge 5 -> 6 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6459d02
Disable failing windows tests (#255)
azeey May 21, 2024
61eaf37
Fix windows warnings (#199) (#258)
Crola1702 May 24, 2024
e2a18dd
Fix msvc warning (#250)
azeey Mar 19, 2024
bdaacf5
Supress msvc dll exported interface warning (#263)
Blast545 May 29, 2024
455cfec
Fix libwebsocket shutdown behavior (#267)
nkoenig Jul 24, 2024
dc18143
merge from ign-launch5
iche033 Aug 2, 2024
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
1 change: 1 addition & 0 deletions plugins/joy_to_twist/JoyToTwist.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#endif

#include <string>
#include <vector>

#include <gz/msgs/joy.pb.h>
#include <gz/msgs/twist.pb.h>
Expand Down
11 changes: 8 additions & 3 deletions plugins/websocket_server/WebsocketServer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,14 @@ void WebsocketServer::Run()

while (this->run)
{
// The second parameter is a timeout that is no longer used by
// libwebsockets.
lws_service(this->context, 0);
// The second parameter is used to control lws's event wait time.
// A -1 does not wait for an event, and 0 causes lws to wait
// for an event. When shutting down the websocket server, the
// wait time could be over 30 seconds if 0 is used.
//
// We are running lws in a separate thread with out our own
// condition variable. So, we will not use lws's event wait.
lws_service(this->context, -1);

// Wait for (1/60) seconds or an event.
std::unique_lock<std::mutex> lock(this->runMutex);
Expand Down
6 changes: 3 additions & 3 deletions src/cmd/cmdlaunch.rb.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

require 'pathname'
# Constants.
LIBRARY_VERSION = '@PROJECT_VERSION_FULL@'
COMMANDS = {
Expand All @@ -28,9 +29,8 @@ class Cmd
command = args[0]
exe_name = COMMANDS[command]

if exe_name[0] == '/'
# If the first character is a slash, we'll assume that we've been given an
# absolute path to the executable. This is only used during test mode.
if Pathname.new(exe_name).absolute?
# The exe_name can be absolute path during test. We'll leave it unchanged
else
# We're assuming that the library path is relative to the current
# location of this script.
Expand Down
Loading