Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

[libuv] upgrade to 1.6.1 #25475

Closed
wants to merge 2 commits into from
Closed

[libuv] upgrade to 1.6.1 #25475

wants to merge 2 commits into from

Conversation

saghul
Copy link
Member

@saghul saghul commented Jun 4, 2015

saghul and others added 2 commits June 5, 2015 19:50
The -fno-strict-aliasing flag was added to fix compilation warnings when
building Node.js with GCC <= 4.4

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: #9179

PR: #25141
PR-URL: #25141
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
@saghul saghul changed the title [libuv] upgrade to 1.6.0 [libuv] upgrade to 1.6.1 Jun 5, 2015
@saghul
Copy link
Member Author

saghul commented Jun 5, 2015

Make that 1.6.1 :-)

@@ -225,11 +225,10 @@ int uv_fs_event_start(uv_fs_event_t* handle,
}

if (!handle->buffer) {
handle->buffer = (char*)_aligned_malloc(uv_directory_watcher_buffer_size,
sizeof(DWORD));
handle->buffer = (char*)uv__malloc(uv_directory_watcher_buffer_size);

Choose a reason for hiding this comment

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

@saghul IIUC, here the call to _aligned_malloc would be replaced (by default) by a call to malloc, is it intentional and what is the impact of such a change?

Copy link
Member Author

Choose a reason for hiding this comment

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

That was reviewed back in the day and Bert pointed out that plain malloc
provided the necessary alignment in that case, that's why we dropped it.
On Jun 11, 2015 21:05, "Julien Gilli" notifications@github.com wrote:

In deps/uv/src/win/fs-event.c
#25475 (comment):

@@ -225,11 +225,10 @@ int uv_fs_event_start(uv_fs_event_t* handle,
}

if (!handle->buffer) {

  • handle->buffer = (char*)_aligned_malloc(uv_directory_watcher_buffer_size,
  •                                        sizeof(DWORD));
    
  • handle->buffer = (char*)uv__malloc(uv_directory_watcher_buffer_size);

@saghul https://github.com/saghul IIUC, here the call to _aligned_malloc
would be replaced by a call to malloc, is it intentional and what is the
impact of such a change?


Reply to this email directly or view it on GitHub
https://github.com/joyent/node/pull/25475/files#r32255959.

Choose a reason for hiding this comment

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

@saghul Sounds good, thank you for the clarification!

@misterdjules
Copy link

@saghul One question just to make sure I don't leave any stone unturned, otherwise that looks good. Will land asap unless the answer to that question means we need to change something.

Thank you once again @saghul 👍

@misterdjules
Copy link

LGTM.

@misterdjules
Copy link

@saghul @joyent/node-collaborators Landing with http://jenkins.nodejs.org/job/node-accept-pull-request/127/.

misterdjules pushed a commit that referenced this pull request Jun 16, 2015
Fixes: #9310

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: #25475
trevnorris added a commit that referenced this pull request Jun 16, 2015
The -fno-strict-aliasing flag was added to fix compilation warnings when
building Node.js with GCC <= 4.4

PR: #25141

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: #25475
@misterdjules
Copy link

Landed in 50f9615 and 097607c. Thank you very much once again @saghul 👍

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants