Skip to content

src: change macro to fn - #23603

Closed
ginonott wants to merge 2 commits into
nodejs:masterfrom
ginonott:change_macro_to_inline_fn
Closed

src: change macro to fn#23603
ginonott wants to merge 2 commits into
nodejs:masterfrom
ginonott:change_macro_to_inline_fn

Conversation

@ginonott

@ginonottginonott commented Oct 12, 2018•
edited by BridgeAR
Loading

Copy link
Copy Markdown

Change base64_encoded_size and unbase64 to inline functions. The base64_encoded_size
is a constexpr to be used in function declarations.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

Gino Notto
change macro to fn
5144f6b
Change base64_encoded_size and unbase64 to inline functions. The base64_encoded_size
is a constexpr to be used in function declarations.
@nodejs-github-botnodejs-github-bot added buffer Issues and PRs related to the buffer subsystem. c++ Issues and PRs that require attention from people who are familiar with C++. inspector Issues and PRs related to the V8 inspector protocol labels Oct 12, 2018
addaleax
addaleax approved these changes Oct 12, 2018
View reviewed changes

@addaleaxaddaleax 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.

Any reason for marking this WIP? It looks good to me :)

Comment threadsrc/inspector_socket.cc Outdated
FRAME_OK, FRAME_INCOMPLETE, FRAME_CLOSE, FRAME_ERROR
};


@addaleaxaddaleaxOct 12, 2018

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.

I think this is an unrelated whitespace change?

@jasnelljasnell added the code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. label Oct 12, 2018
@ginonottginonott changed the title [WIP] change macro to fnChange macro to fnOct 12, 2018
@refack

refack commented Oct 12, 2018

Copy link
Copy Markdown
Contributor

Hello @ginonott and thank you for your contribution 🥇
I left a few comments, but generally I like the approach of this PR.

BTW: So that this submission could be attributed to you properly, you might want to make sure your GitHub email, and local git email are set up to your liking (Ref: https://help.github.com/articles/setting-your-commit-email-address-on-github/)

@refackrefack removed the inspector Issues and PRs related to the V8 inspector protocol label Oct 12, 2018
refack
refack reviewed Oct 12, 2018
View reviewed changes
Comment threadsrc/base64.h
//// Base 64 ////
#define base64_encoded_size(size) ((size + 2 - ((size + 2) % 3)) / 3 * 4)

static inline constexpr size_t base64_encoded_size(size_t size) {

@refackrefackOct 12, 2018

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.

constexpr implies inline, so no need to specify inline

@thefourtheyethefourtheyeOct 13, 2018

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.

https://en.cppreference.com/w/cpp/language/constexpr says

A constexpr specifier used in a function or static member variable (since C++17) declaration implies inline

We are not yet at C++17, right? IINW, We are still at C++14.

@refackrefackOct 13, 2018

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.

CPPReference is tricky to read. It's only the static member variable (since C++17) part that is the addition to C++17 (see this change)
In C++11 there were no constexpr static member variables, they were added in C++17.

Comment threadsrc/inspector_socket.cc Outdated
FRAME_OK, FRAME_INCOMPLETE, FRAME_CLOSE, FRAME_ERROR
};


@refackrefackOct 12, 2018

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.

Unneeded whitespace change.

Comment threadsrc/base64.h

#define unbase64(x) \
static_cast<uint8_t>(unbase64_table[static_cast<uint8_t>(x)])
inline static int8_t unbase64(uint8_t x) {

@refackrefackOct 12, 2018•
edited
Loading

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.

IIUC if you declare unbase64_table as constexpr you could declare this function as constexpr as well.

@BridgeARBridgeAR changed the title Change macro to fnsrc: change macro to fnOct 12, 2018
@addaleax

addaleax commented Oct 15, 2018

Copy link
Copy Markdown
Member

CI: https://ci.nodejs.org/job/node-test-pull-request/17860

@addaleaxaddaleax added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Oct 15, 2018
BridgeAR pushed a commit to BridgeAR/node that referenced this pull request Oct 15, 2018
Gino Notto@BridgeAR
src: change macro to fn
07d982d
Change base64_encoded_size and unbase64 to inline functions. The
base64_encoded_size is a constexpr to be used in function declarations.
PR-URL: nodejs#23603
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
BridgeAR pushed a commit to BridgeAR/node that referenced this pull request Oct 15, 2018
Gino Notto@BridgeAR
src: change macro to fn
17c35a6
Change base64_encoded_size and unbase64 to inline functions. The
base64_encoded_size is a constexpr to be used in function declarations.
PR-URL: nodejs#23603
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
@BridgeAR

BridgeAR commented Oct 15, 2018

Copy link
Copy Markdown
Member

Landed in 17c35a6 🎉

@ginonott congratulations on your first commit to Node.js!

jasnell pushed a commit that referenced this pull request Oct 17, 2018
Gino Notto@jasnell
src: change macro to fn
fd7fc99
Change base64_encoded_size and unbase64 to inline functions. The
base64_encoded_size is a constexpr to be used in function declarations.
PR-URL: #23603
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
addaleax pushed a commit that referenced this pull request Oct 20, 2018
Gino Notto@addaleax
src: change macro to fn
31ceeff
Change base64_encoded_size and unbase64 to inline functions. The
base64_encoded_size is a constexpr to be used in function declarations.
PR-URL: #23603
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
MylesBorins pushed a commit that referenced this pull request Oct 30, 2018
Gino Notto@MylesBorins
src: change macro to fn
dd91c1d
Change base64_encoded_size and unbase64 to inline functions. The
base64_encoded_size is a constexpr to be used in function declarations.
PR-URL: #23603
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
@codebyterecodebytere mentioned this pull request Nov 27, 2018
Closed
rvagg pushed a commit that referenced this pull request Nov 28, 2018
Gino Notto@rvagg
src: change macro to fn
72fd57f
Change base64_encoded_size and unbase64 to inline functions. The
base64_encoded_size is a constexpr to be used in function declarations.
PR-URL: #23603
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
MylesBorins pushed a commit that referenced this pull request Nov 29, 2018
Gino Notto@MylesBorins
src: change macro to fn
e7bf838
Change base64_encoded_size and unbase64 to inline functions. The
base64_encoded_size is a constexpr to be used in function declarations.
PR-URL: #23603
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
@codebyterecodebytere mentioned this pull request Nov 29, 2018
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jasnelljasnelljasnell approved these changes
@addaleaxaddaleaxaddaleax approved these changes
@gireeshpunathilgireeshpunathilgireeshpunathil approved these changes
+2 more reviewers
@refackrefackrefack left review comments
@thefourtheyethefourtheyethefourtheye approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

author readyPRs that have at least one approval, no pending requests for changes, and a CI started.bufferIssues and PRs related to the buffer subsystem.c++Issues and PRs that require attention from people who are familiar with C++.code-and-learnIssues related to the Code-and-Learn events and PRs submitted during the events.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@ginonott@refack@addaleax@BridgeAR@jasnell@thefourtheye@gireeshpunathil@nodejs-github-bot