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.

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

Jump to bottom

Integrate samu #15

Closed
wants to merge 52 commits into from
Closed

Integrate samu #15

wants to merge 52 commits into from

Conversation

annacrombie
Copy link
Collaborator

No description provided.

annacrombie and others added 25 commits January 10, 2024 07:27
@annacrombie
rename timer_end to timer_read
38f9de1
@annacrombie
integrate samurai
eed0346 
Copy samurai's sources into muon's tree and refactor slightly

To prevent name collisions during bootstrap:
- prefix all identifiers with samu_ or SAMU_

To make reentrant:
- move all global state into a struct that gets passed around (samu_ctx)
- convert all memory allocations to use an arena
@annacrombie
factor samu output to allow outputting to file
c9a1648 
This allows muon to run samu -t compdb internally and redirect the
output to compile_commands.json without the ugly fs_redirect functions.
@annacrombie
error on external_program.full_path if multi elem
9deaf33
@annacrombie
remove ninja requirement from muon bootstrap
c3a525b
@annacrombie
port samu build to use run_cmd_ctx
232b5b8
@annacrombie
run_cmd posix: check if child terminated by signal
3b56302
@annacrombie
remove some more cleanup functions that do nothing
4489187
@annacrombie
move mtime calculation to platform/
4eec0d7
@annacrombie
change scan.c to use a buffer directly
a43f5c9
@annacrombie
move os_ functions that only path should call
f8054b4
@annacrombie
fix arrangement of tracy calls wrt freed pointers
40d4ca8
@annacrombie
use fs_write in samu_write_file
a2226ce
@annacrombie
fix argument type
5ea94d6
@annacrombie
use fs_mkdir functions in samu_makedirs
253b287
@annacrombie
use path_chdir rather than chdir
5684611
@annacrombie
add os_ functions for querying job spawning info
aea8927
@annacrombie
use os_parallel_job_count() in cmd_test
b638101 
to set default job count
@annacrombie
use path_cwd rather than getcwd
da01690
@annacrombie
remove unused includes
5e57858
@annacrombie
re-add job failure message
40c77ef
@michaelforney @annacrombie
Include exit status in job failure message
c13a701
@michaelforney @annacrombie
deps: Handle escaped newlines in Makefile fragments
7d224d0
@annacrombie
fix detection/usage of getloadavg
fdaf9a8
@annacrombie
fix macos build
8a03815
@vtorri
Copy link
Contributor

vtorri commented Jan 14, 2024

on Windows, for os_parallel_job_count(), you can look at

https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getlogicalprocessorinformation

and get the value of logicalProcessorCount

@vtorri
Copy link
Contributor

vtorri commented Jan 14, 2024

@annacrombie will you add the windows code ?

@vtorri
Copy link
Contributor

vtorri commented Jan 14, 2024

ideas for getloadavg() on Windows:

giampaolo/psutil@02dd837#top

@annacrombie
remove bogus assert
0289042
@annacrombie
samu_makedirs: don't fail if dir already exists
0d9cc5f
@annacrombie
samu deps.c: avoid rename() call
e78d694
@annacrombie
fs_read: report EOF error correctly
05b480d
@annacrombie
change muon private dir to .muon
efaff85
@annacrombie
set ninja builddir as muon private dir
3315256 
This causes .ninja* files to be put into .muon which slightly declutters
the build dir.  Not that anyone cares :)
@annacrombie
add win32_fatal
6089e9f
@annacrombie
change samu mtime special values
679fd8d 
1 and 2 seem more unlikely to me, and they are much more easily
  identified in a debugger
@annacrombie
refactor samu deps parser to not use f* calls
267c9a8
@annacrombie
refactor samu log parser to not use f* calls
9e34ab3
@annacrombie
remove setvbuf call
2aabf8d
@annacrombie
avoid non-standard %z specifier
548c53e
@annacrombie
sbuf: allow into_str with manual alloc'd sbuf
2882acb
@annacrombie
use sbuf_into_str with run_cmd output
7e01271
@annacrombie
fix implementation of windows fs_mtime
e147af2
@annacrombie
refactor windows run_cmd to allow async commands
3e1f9a1 
also add run_cmd_unsplit for samu on windows
@annacrombie
use sbufs in posix run cmd
fd23afc
@annacrombie
fix warnings
794d272
@annacrombie annacrombie deleted the integrate_samu branch January 25, 2024 11:17
@annacrombie annacrombie restored the integrate_samu branch January 25, 2024 11:17
@annacrombie annacrombie reopened this Jan 25, 2024
@annacrombie annacrombie deleted the integrate_samu branch January 25, 2024 11:26
@annacrombie
Copy link
Collaborator Author

why does github keep auto-closing this?

@annacrombie annacrombie restored the integrate_samu branch January 25, 2024 11:27
@annacrombie annacrombie reopened this Jan 25, 2024
@annacrombie annacrombie deleted the integrate_samu branch January 31, 2024 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vtorri vtorri vtorri left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@annacrombie @vtorri @michaelforney