Skip to content

use common func wd_find_msg_in_pool to replace wd_xxx_get_msg #646

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

Open
gaozhangfei wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

use common func wd_find_msg_in_pool to replace wd_xxx_get_msg #646

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
785f0fa
uadk: use wd_find_msg_in_pool to replace wd_xxx_get_msg
zhangfeigao Sep 8, 2024
5eedbb8
uadk: move wd_util and wd_shced to libwd
zhangfeigao Sep 8, 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 Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ uadk_drivers_LTLIBRARIES=libhisi_sec.la libhisi_hpre.la libhisi_zip.la \
libisa_ce.la libisa_sve.la libhisi_dae.la

libwd_la_SOURCES=wd.c wd_mempool.c wd.h wd_alg.c wd_alg.h \
wd_sched.c wd_util.c \

@youngersh youngersh Dec 10, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If you think it is unnecessary for alg.so, you should remove it from alg_SOURCE.

@gaozhangfei gaozhangfei Dec 10, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

如果完全其他库Makefile删掉wd_sched.c wd_util.c,
那libwd.map 还需要export 蛮多函数的
这些函数都是其他库用到的，

/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_get_env_param' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_parse_async_poll_en'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_get_msg_from_pool' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_check_ctx'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_attrs_init' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_ctx_param_init'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_add_task_to_async_queue' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_clear_ctx_config'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_try_init' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_check_datalist'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_check_src_dst' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_init_sched'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_uninit_driver' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_drv_bind'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_set_ctx_attr' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_env_init'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_uninit_async_request_pool' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_init_ctx_config'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_clear_sched' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_drv_unbind'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_dlopen_drv' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_env_uninit'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_ctx_param_uninit' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_put_msg_to_pool'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_attrs_uninit' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_init_param_check'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_handle_msg_sync' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_alg_init_driver'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_parse_ctx_num' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_init_async_request_pool'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_memset_zero' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_set_epoll_en'
/usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_get_lib_file_path' /usr/bin/ld: /home/linaro/work/uadk/.libs/libwd_crypto.so: undefined reference to wd_dlclose_drv'

  •   wd_sched_rr_instance;

  •   wd_sched_rr_alloc;

  •   wd_sched_rr_release;

  •   wd_find_msg_in_pool;

这几个函数是app 或者是驱动用到的。

@youngersh youngersh Dec 11, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

那这样的逻辑下你无法删除原有的引用，反而要在libwd中新增了wd_sched和wd_util，它的目的在于什么地方呢？如果说你把所有接口全部整改那这个逻辑我理解是成立的，所有公共部分全部放到libwd中，alg对公共的依赖由libwd提供就好。但是现在的修改方案既不能保证alg和公共文件的解耦，由让libwd和公共文件耦合，无法理解它的好处。

v1/wd.c v1/wd.h v1/wd_adapter.c v1/wd_adapter.h \
v1/wd_rng.c v1/wd_rng.h \
v1/wd_rsa.c v1/wd_rsa.h \
Expand Down
5 changes: 5 additions & 0 deletions libwd.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,10 @@ global:
wd_enable_drv;
wd_disable_drv;
wd_get_alg_head;

wd_sched_rr_instance;
wd_sched_rr_alloc;
wd_sched_rr_release;
wd_find_msg_in_pool;
local: *;
};
6 changes: 0 additions & 6 deletions libwd_comp.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ global:
wd_comp_get_driver;
wd_comp_reset_sess;

wd_sched_rr_instance;
wd_sched_rr_alloc;
wd_sched_rr_release;

wd_deflate_init;
wd_deflate;
wd_deflate_reset;
Expand All @@ -35,7 +31,5 @@ global:
wd_inflate;
wd_inflate_reset;
wd_inflate_end;

wd_find_msg_in_pool;
local: *;
};
5 changes: 0 additions & 5 deletions libwd_crypto.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,5 @@ global:
wd_ecc_ctx_num_init;
wd_ecc_ctx_num_uninit;
wd_ecc_get_env_param;

wd_sched_rr_instance;
wd_sched_rr_alloc;
wd_sched_rr_release;
wd_find_msg_in_pool;
local: *;
};
5 changes: 0 additions & 5 deletions libwd_dae.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,5 @@ global:
wd_agg_get_output_async;
wd_agg_rehash_sync;
wd_agg_poll;

wd_sched_rr_instance;
wd_sched_rr_alloc;
wd_sched_rr_release;
wd_find_msg_in_pool;
local: *;
};