Skip to content

Rename cgroup.cpp to cgroupcpu.cpp #83029

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

Merged
jkotas merged 2 commits into from
Mar 8, 2023
Merged

Rename cgroup.cpp to cgroupcpu.cpp #83029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31fbec1
Revert "Revert "Enable symbol stripping for crossgen2 (#82698)" (#828…
am11 Mar 6, 2023
1dd525f
Rename cgroup.cpp to cgroupcpu.cpp
am11 Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/nativeaot/Runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ else()
)

list(APPEND FULL_RUNTIME_SOURCES
unix/cgroup.cpp
unix/cgroupcpu.cpp
unix/HardwareExceptions.cpp
unix/UnixContext.cpp
unix/UnixSignals.cpp
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/nativeaot/Runtime/unix/PalRedhawkUnix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,6 @@ void ConfigureSignals()
signal(SIGPIPE, SIG_IGN);
}

extern bool GetCpuLimit(uint32_t* val);

void InitializeCurrentProcessCpuCount()
{
uint32_t count;
Expand Down
5 changes: 0 additions & 5 deletions ...coreclr/nativeaot/Runtime/unix/cgroup.cpp → ...eclr/nativeaot/Runtime/unix/cgroupcpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,11 +500,6 @@ void InitializeCpuCGroup()
CGroup::Initialize();
}

void CleanupCpuCGroup()
{
CGroup::Cleanup();
}

bool GetCpuLimit(uint32_t* val)
{
if (val == nullptr)
Expand Down
4 changes: 1 addition & 3 deletions src/coreclr/nativeaot/Runtime/unix/cgroupcpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.


#ifndef __CGROUPCPU_H__
#define __CGROUPCPU_H__

void InitializeCpuCGroup();
void CleanupCpuCGroup();
bool GetCpuLimit(uint32_t* val);

#endif // __CGROUPCPU_H__

6 changes: 5 additions & 1 deletion src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<NativeAotSupported Condition="'$(CrossBuild)' == 'true' and '$(TargetOS)' != '$(HostOS)'">false</NativeAotSupported>
<!-- Can't use NativeAOT in source build yet https://github.com/dotnet/runtime/issues/66859 -->
<NativeAotSupported Condition="'$(DotNetBuildFromSource)' == 'true'">false</NativeAotSupported>
<ObjCopyName Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(CrossBuild)' == 'true' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">llvm-objcopy-15</ObjCopyName>
<ObjCopyName Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(CrossBuild)' == 'true' and '$(RuntimeIdentifier)' == 'linux-arm64'">aarch64-linux-gnu-objcopy</ObjCopyName>
</PropertyGroup>

<Target Name="PublishCrossgen"
Expand All @@ -33,7 +35,7 @@
DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
SkipUnchangedFiles="true" />

<MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"
<MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"
Targets="Restore"
Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())
;_IsPublishing=true
Expand All @@ -48,6 +50,8 @@
;RuntimeIdentifier=$(PackageRID)
;NativeAotSupported=$(NativeAotSupported)
;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
;StripSymbols=true
;ObjCopyName=$(ObjCopyName)
;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets">
<Output TaskParameter="TargetOutputs"
ItemName="_RawCrossgenPublishFiles" />
Expand Down