Open
Conversation
Implement ModifySceneAddReferenceObjectPK and ModifySceneRemoveRefere…
Implement ModifySceneAddReferenceObjectPK and ModifySceneRemoveRefere…
Scoped cURL
Scoped cURL
…t-controller-into-webstack
The controller common utilities only need the webstack client. Note: for now, createwebstackclient.h provides an alias for the controllerclient since call sites expect that. This alias may CAUSE ODR VIOLATIONS. Well... suffer the wrath of multiple repos. This alias will be removed after callers have migrated. Also (side-note, mostly for my own sanity): the mujinzmq exception details have been tweaked so that we don't have to keep an enum consistent between controller common and the planning client. In particular, an instance of MEC_timeout has become MCCE_failed. There's arguments that all the MEC_ errors in mujinzmq should actually be MCCE_ZmqError, but this is hopefully extremely minor.
createwebstackclient needed some care to build in its new home. In particular: its function name was colliding with the basic creator in webstackclient.h, and it needed the MUJINWEBSTACKCLIENT_API attribute. Mujin definitions is removed -- its not needed for webstack and planning client provides it. Mujin JSON too has been superceeded by its planning client counterpart, if both are included (as they are in the vision manager, through a myriad of inclusion paths). Some spooky action at a distance: we inherit from MujinControllerCommonException if there is an inclusion path that includes controller common's mujinjson. TODO(document/team#86): fix this (or document it). It's better to define what class mujinjson::MujinJSONException should inherit from as the macro than just replacing the class. This can also ensure that mujinjsonwebstack::MujinJSONException is always a std::exception (which might be better).
…ntroller-into-webstack This is to preserve the history of the ControllerClientInfo class.
…roller-into-webstack This is to preserve the history of _ParseClientInfoFromUrl, which will be exposed as a static factory functio inside the WebstackClientInfo (so that createwebstackclient can reuse the URL parsing logic).
…ientInfo's Reset method
The idea is that if mujinjson::MujinJSONExceptionInternal (from controller common) is defined, we use that. The typedef is there to handle the discrpancy in the namespace. This is done so that you can catch any JSON exception in one catch.
Also add some logging because I'm losing my mind a little.
… webstack to be local
…5c7dc334368c00250bf9b03068a6517f37 This makes it so getting JSON from HTTP GETs and POSTs do not clear the allocators of the caller-provided documents.
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This is for demonstration purposes; mostly. But I actually think this is close to feasible. I have to fix a few things:
masteris a subset ofcontrollerclientcpp; I might want to make it the full thing first.mujinjson,mujinexceptions) will move to planning, so will be deletions instead of diffs here.controllerclient.handcontrollerclientimpl.cppto pair withwebstackclient.handwebstackclient.cpp(I forgot that I removed the virtual base class here).