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

Macosx uses a different layout for struct flock. #821

Merged
merged 1 commit into from Sep 13, 2013

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Sep 13, 2013

The changes in #662, #814 break on macosx because apparently flock has a different layout there:

i.e. on mac:

struct flock {
        off_t   l_start;        /* starting offset */
        off_t   l_len;          /* len = 0 means until end of file */
        pid_t   l_pid;          /* lock owner */                                                                                                                                                                                                          
        short   l_type;         /* lock type: read/write, etc. */
        short   l_whence;       /* type of l_start */
};

vs on linux:

struct flock {
        short   l_type;
        short   l_whence;
        off_t   l_start;
        off_t   l_len;                                                                                                                                                                                                                                    
        pid_t   l_pid;
        __ARCH_FLOCK_PAD
};

this change adds an helper which takes care of the layout.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @ktf (Giulio Eulisse) for CMSSW_7_0_X.

Macosx uses a different layout for struct flock.

It involves the following packages:

EventFilter/Utilities

@mommsen, @emeschi can you please review it and eventually sign? Thanks.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@ktf you are the release manager for this.

@ktf
Copy link
Contributor Author

ktf commented Sep 13, 2013

I'll by-pass this. It passes my tests at:

https://cmssdt.cern.ch/jenkins/job/Pull-Request-Integration/ARCHITECTURE=slc5_amd64_gcc481/496/console

Moan if you think this is wrong.

ktf added a commit that referenced this pull request Sep 13, 2013
Macosx uses a different layout for struct flock.
@ktf ktf merged commit eba9d36 into cms-sw:CMSSW_7_0_X Sep 13, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants