Skip to content

Add C declarations needed for zmq http server#1595

Merged
Frenzie merged 5 commits into
koreader:masterfrom
bneo99:httpserver_zmq
Apr 9, 2023
Merged

Add C declarations needed for zmq http server#1595
Frenzie merged 5 commits into
koreader:masterfrom
bneo99:httpserver_zmq

Conversation

@bneo99

@bneo99 bneo99 commented Apr 8, 2023

Copy link
Copy Markdown
Contributor

Required by koreader to create a zmq http server


This change is Reviewable

Comment thread ffi/zeromq_h.lua Outdated
Comment on lines +116 to +117
int zmq_send(void *, void *, size_t, int);
int zframe_send(zframe_t **, void *, int);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the biggest deal but these seem to be in the "wrong" location compared to their definition?

@Frenzie Frenzie left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NiLuJe

NiLuJe commented Apr 8, 2023

Copy link
Copy Markdown
Member

LGTM besides the ordering nit mentioned above (which will make diff'ing further updates confusing, so, yeah, please fix it ;)).

@bneo99

bneo99 commented Apr 9, 2023

Copy link
Copy Markdown
Contributor Author

Whoops, should be fixed now

Comment thread ffi-cdecl/zeromq_cdecl.c
Comment on lines 119 to -115
cdecl_func(zhash_lookup)
cdecl_func(zmsg_destroy)
cdecl_func(zhash_destroy)
cdecl_func(zframe_destroy)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like all the destroys are purposefully together. You prefer them as all the zframes together?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is other destroys that are grouped with their own class functions. I'll move the other destroys to their own groups. So all functions to be grouped by their class (zhash, zctx, zframe etc.)

@Frenzie Frenzie left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine by me, waiting for @NiLuJe ^_^

@Frenzie Frenzie merged commit 263b211 into koreader:master Apr 9, 2023
@bneo99 bneo99 deleted the httpserver_zmq branch April 10, 2023 00:58
Frenzie added a commit to Frenzie/koreader that referenced this pull request Apr 16, 2023
Includes:

* Fix build on Mac OS X 13.3+ (missing ifr_netmask) (koreader/koreader-base#1596)
* Add C declarations needed for zmq http server (koreader/koreader-base#1595)
* SDL: add multitouch support (koreader/koreader-base#1599)
Frenzie added a commit to koreader/koreader that referenced this pull request Apr 16, 2023
Includes:

* Fix build on Mac OS X 13.3+ (missing ifr_netmask) (koreader/koreader-base#1596)
* Add C declarations needed for zmq http server (koreader/koreader-base#1595)
* SDL: add multitouch support (koreader/koreader-base#1599)
0xstillb pushed a commit to 0xstillb/koreader-thai that referenced this pull request May 9, 2026
Includes:

* Fix build on Mac OS X 13.3+ (missing ifr_netmask) (koreader/koreader-base#1596)
* Add C declarations needed for zmq http server (koreader/koreader-base#1595)
* SDL: add multitouch support (koreader/koreader-base#1599)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants