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.

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

[LibOS] Change prefix from shim_ do libos_ #681

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Conversation

boryspoplawski
Copy link
Contributor

@boryspoplawski boryspoplawski commented Jun 24, 2022

Description of the changes

This is main part of the rename - changes prefix on everything in LibOS code.


This change is Reviewable

Copy link
Contributor Author

@boryspoplawski boryspoplawski left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 124 files reviewed, 1 unresolved discussion, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: ITL)

a discussion (no related file):
#680 must be merged first


Base automatically changed from borys/shim_libos to master June 24, 2022 07:09
Copy link

@dimakuv dimakuv left a comment

Choose a reason for hiding this comment

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

Reviewed 124 of 124 files at r1, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: ITL) (waiting on @boryspoplawski)

a discussion (no related file):

Previously, boryspoplawski (Borys Popławski) wrote…

#680 must be merged first

Done.



Documentation/index.rst line 109 at r1 (raw file):

   :caption: LibOS

   libos/libos-init

There was a bug in this PR. The reference to the shim-init.rst file was changed to libos-init.rst, but the file was not renamed itself.


Documentation/devel/new-syscall.rst line 10 at r1 (raw file):

For example, assume we are implementing :manpage:`sched_setaffinity(2)`. You
must add the prototype of the function implementing it to :file:`shim_table.h`::

FYI: Reminder for myself and other reviewers: this PR does not change filenames, so here the reference to shim_table.h is correct. This will be changed in a follow-up PR.

I only took a liberty to rename one file inside Documentation/, because that change was simple and contained.


libos/include/shim_table.h line 18 at r1 (raw file):

typedef void (*libos_syscall_t)(void);

extern libos_syscall_t libos_table[];

libos_table doesn't mean much. I suggest to rename to libos_syscall_table.

dimakuv
dimakuv previously approved these changes Jun 24, 2022
Copy link

@dimakuv dimakuv left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 4 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion, not enough approvals from maintainers (1 more required) (waiting on @boryspoplawski)


Documentation/index.rst line 109 at r1 (raw file):

Previously, dimakuv (Dmitrii Kuvaiskii) wrote…

There was a bug in this PR. The reference to the shim-init.rst file was changed to libos-init.rst, but the file was not renamed itself.

Done


libos/include/shim_table.h line 18 at r1 (raw file):

Previously, dimakuv (Dmitrii Kuvaiskii) wrote…

libos_table doesn't mean much. I suggest to rename to libos_syscall_table.

Done

Copy link
Contributor Author

@boryspoplawski boryspoplawski left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 4 files at r2, all commit messages.
Reviewable status: all files reviewed, all discussions resolved, not enough approvals from maintainers (1 more required)


Documentation/index.rst line 109 at r1 (raw file):

Previously, dimakuv (Dmitrii Kuvaiskii) wrote…

Done

I wanted to avoid any file renames in this PR, but I guess this one shouldnt be a problem

Copy link
Member

@mkow mkow left a comment

Choose a reason for hiding this comment

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

Reviewed 121 of 124 files at r1, 4 of 4 files at r2, all commit messages.
Reviewable status: all files reviewed, 6 unresolved discussions, not enough approvals from maintainers (1 more required) (waiting on @boryspoplawski)


-- commits line 2 at r2:

Suggestion:

from `shim_` to `libos_`

-- commits line 4 at r2:

Suggestion:

This is the main

libos/include/shim_types.h line 159 at r2 (raw file):

typedef Elf64_auxv_t elf_auxv_t;

/* typedef for libos internal types */

Suggestion:

LibOS

libos/src/shim_checkpoint.c line 366 at r2 (raw file):

    struct libos_palhdl_entry* palhdl_entries = (struct libos_palhdl_entry*)(base +
                                                                           hdr->palhdl_offset);

alignment broke here


libos/src/arch/x86_64/shim_context.c line 81 at r2 (raw file):

    struct libos_xstate* xstate = (struct libos_xstate*)xstate_extended;
    char* bytes_after_xstate   = (char*)xstate_extended + g_libos_xsave_size;

please fix alignment (ideally, just remove it)


libos/src/sys/shim_poll.c line 58 at r2 (raw file):

    struct fds_mapping_t {
        struct libos_handle* hdl; /* NULL if no mapping (handle is not used in polling) */
        nfds_t idx;              /* index from fds array to pals array */

please fix alignment

This is the main part of the rename - changes prefix on everything in
LibOS code.

Signed-off-by: Borys Popławski <[email protected]>
Copy link
Contributor Author

@boryspoplawski boryspoplawski left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 6 unresolved discussions, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: ITL) (waiting on @mkow)


-- commits line 2 at r2:
Done.


-- commits line 4 at r2:
Done.


libos/include/shim_types.h line 159 at r2 (raw file):

typedef Elf64_auxv_t elf_auxv_t;

/* typedef for libos internal types */

Done.


libos/src/shim_checkpoint.c line 366 at r2 (raw file):

Previously, mkow (Michał Kowalczyk) wrote…

alignment broke here

Done.


libos/src/arch/x86_64/shim_context.c line 81 at r2 (raw file):

Previously, mkow (Michał Kowalczyk) wrote…

please fix alignment (ideally, just remove it)

Done.


libos/src/sys/shim_poll.c line 58 at r2 (raw file):

Previously, mkow (Michał Kowalczyk) wrote…

please fix alignment

Done.

Copy link
Member

@mkow mkow left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 4 files at r3, all commit messages.
Reviewable status: all files reviewed, all discussions resolved, not enough approvals from maintainers (1 more required), not enough approvals from different teams (1 more required, approved so far: ITL)

Copy link

@dimakuv dimakuv left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 4 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@dimakuv dimakuv merged commit 0a7112a into master Jun 27, 2022
@dimakuv dimakuv deleted the borys/shim_libos_2 branch June 27, 2022 06:26
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