You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2022/05/29 13:20:20 UTC
[GitHub] [apisix] spacewander opened a new pull request, #7160: fix(xds): handle removed symbol in apisix-base
spacewander opened a new pull request, #7160:
URL: https://github.com/apache/apisix/pull/7160
It causes the CI error:
https: //github.com/apache/apisix/runs/6643228643?check_suite_focus=true
Signed-off-by: spacewander <sp...@gmail.com>
### Description
<!-- Please include a summary of the change and which issue is fixed. -->
<!-- Please also include relevant motivation and context. -->
Fixes # (issue)
### Checklist
- [x] I have explained the need for this PR and the problem it solves
- [ ] I have explained the changes or the new features added to this PR
- [ ] I have added tests corresponding to this change
- [ ] I have updated the documentation to reflect this change
- [ ] I have verified that this change is backward compatible (If not, please discuss on the [APISIX mailing list](https://github.com/apache/apisix/tree/master#community) first)
<!--
Note
1. Mark the PR as draft until it's ready to be reviewed.
2. Always add/update tests for any changes unless you have a good reason.
3. Always update the documentation to reflect the changes made in the PR.
4. Make a new commit to resolve conversations instead of `push -f`.
5. To resolve merge conflicts, merge master instead of rebasing.
6. Use "request review" to notify the reviewer after making changes.
7. Only a reviewer can mark a conversation as resolved.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] spacewander commented on a diff in pull request #7160: fix(xds): handle removed symbol in apisix-base
Posted by GitBox <gi...@apache.org>.
spacewander commented on code in PR #7160:
URL: https://github.com/apache/apisix/pull/7160#discussion_r884286569
##########
t/xds-library/xds.h:
##########
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef XDS_H
+#define XDS_H
+#include <dlfcn.h>
+#include <stdlib.h>
+
+
+void ngx_lua_ffi_shdict_store(void *zone, int op,
+ const unsigned char *key, size_t key_len,
+ int value_type,
+ const unsigned char *str_value_buf, size_t str_value_len,
+ double num_value, long exptime, int user_flags, char **errmsg,
+ int *forcible)
+{
+ static void* dlhandle;
+ static void (*fp)(void *zone, int op,
+ const unsigned char *key, size_t key_len,
+ int value_type,
+ const unsigned char *str_value_buf, size_t str_value_len,
+ double num_value, long exptime, int user_flags, char **errmsg,
+ int *forcible);
+
+ if (!dlhandle) {
+ dlhandle = dlopen(NULL, RTLD_NOW);
+ }
+ if (!dlhandle) {
+ return;
+ }
+
+ fp = dlsym(dlhandle, "ngx_http_lua_ffi_shdict_store");
+ if (!fp) {
+ fp = dlsym(dlhandle, "ngx_meta_lua_ffi_shdict_store");
+ }
+
+ fp(zone, op, key, key_len, value_type, str_value_buf, str_value_len,
+ num_value, exptime, user_flags, errmsg, forcible);
+}
Review Comment:
There is no chance to close it. Anyway, this function is test-only.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] soulbird commented on a diff in pull request #7160: fix(xds): handle removed symbol in apisix-base
Posted by GitBox <gi...@apache.org>.
soulbird commented on code in PR #7160:
URL: https://github.com/apache/apisix/pull/7160#discussion_r884286463
##########
t/xds-library/xds.h:
##########
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef XDS_H
+#define XDS_H
+#include <dlfcn.h>
+#include <stdlib.h>
+
+
+void ngx_lua_ffi_shdict_store(void *zone, int op,
+ const unsigned char *key, size_t key_len,
+ int value_type,
+ const unsigned char *str_value_buf, size_t str_value_len,
+ double num_value, long exptime, int user_flags, char **errmsg,
+ int *forcible)
+{
+ static void* dlhandle;
+ static void (*fp)(void *zone, int op,
+ const unsigned char *key, size_t key_len,
+ int value_type,
+ const unsigned char *str_value_buf, size_t str_value_len,
+ double num_value, long exptime, int user_flags, char **errmsg,
+ int *forcible);
+
+ if (!dlhandle) {
+ dlhandle = dlopen(NULL, RTLD_NOW);
+ }
+ if (!dlhandle) {
+ return;
+ }
+
+ fp = dlsym(dlhandle, "ngx_http_lua_ffi_shdict_store");
+ if (!fp) {
+ fp = dlsym(dlhandle, "ngx_meta_lua_ffi_shdict_store");
+ }
+
+ fp(zone, op, key, key_len, value_type, str_value_buf, str_value_len,
+ num_value, exptime, user_flags, errmsg, forcible);
+}
Review Comment:
Should `dlhandle` be closed, like: `dlclose(dlhandle)`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] spacewander merged pull request #7160: fix(xds): handle removed symbol in apisix-base
Posted by GitBox <gi...@apache.org>.
spacewander merged PR #7160:
URL: https://github.com/apache/apisix/pull/7160
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org