Merge pull request pterodactyl#1882 from Sir3lit/cputhreads

Add CPU Thread assignments

Author: DaneEveritt

app/Http/Controllers/Admin/ServersController.php

@@ -262,7 +262,7 @@ public function updateBuild(Request $request, Server $server)
     {
         $this->buildModificationService->handle($server, $request->only([
             'allocation_id', 'add_allocations', 'remove_allocations',
-            'memory', 'swap', 'io', 'cpu', 'disk',
+            'memory', 'swap', 'io', 'cpu', 'threads', 'disk',
             'database_limit', 'allocation_limit', 'oom_disabled',
         ]));
         $this->alert->success(trans('admin/server.alerts.build_updated'))->flash();

app/Http/Requests/Api/Application/Servers/StoreServerRequest.php

@@ -49,6 +49,7 @@ public function rules(): array
             'limits.swap' => $rules['swap'],
             'limits.disk' => $rules['disk'],
             'limits.io' => $rules['io'],
+            'limits.threads' => $rules['threads'],
             'limits.cpu' => $rules['cpu'],
 
             // Application Resource Limits
@@ -96,6 +97,7 @@ public function validated()
             'disk' => array_get($data, 'limits.disk'),
             'io' => array_get($data, 'limits.io'),
             'cpu' => array_get($data, 'limits.cpu'),
+            'threads' => array_get($data, 'limits.threads'),
             'skip_scripts' => array_get($data, 'skip_scripts', false),
             'allocation_id' => array_get($data, 'allocation.default'),
             'allocation_additional' => array_get($data, 'allocation.additional'),

app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php

@@ -25,6 +25,7 @@ public function rules(): array
             'limits.swap' => $this->requiredToOptional('swap', $rules['swap'], true),
             'limits.io' => $this->requiredToOptional('io', $rules['io'], true),
             'limits.cpu' => $this->requiredToOptional('cpu', $rules['cpu'], true),
+            'limits.threads' => $this->requiredToOptional('threads', $rules['threads'], true),
             'limits.disk' => $this->requiredToOptional('disk', $rules['disk'], true),
 
             // Legacy rules to maintain backwards compatable API support without requiring
@@ -35,6 +36,7 @@ public function rules(): array
             'swap' => $this->requiredToOptional('swap', $rules['swap']),
             'io' => $this->requiredToOptional('io', $rules['io']),
             'cpu' => $this->requiredToOptional('cpu', $rules['cpu']),
+            'threads' => $this->requiredToOptional('threads', $rules['threads']),
             'disk' => $this->requiredToOptional('disk', $rules['disk']),
 
             'add_allocations' => 'bail|array',

app/Services/Servers/BuildModificationService.php

@@ -98,6 +98,7 @@ public function handle(Server $server, array $data)
             'swap' => array_get($data, 'swap'),
             'io' => array_get($data, 'io'),
             'cpu' => array_get($data, 'cpu'),
+            'threads' => array_get($data, 'threads'),
             'disk' => array_get($data, 'disk'),
             'allocation_id' => array_get($data, 'allocation_id'),
             'database_limit' => array_get($data, 'database_limit'),

app/Services/Servers/ServerConfigurationStructureService.php

@@ -81,6 +81,7 @@ protected function returnCurrentFormat(Server $server)
                 'swap' => $server->swap,
                 'io_weight' => $server->io,
                 'cpu_limit' => $server->cpu,
+                'threads' => $server->threads,
                 'disk_space' => $server->disk,
             ],
             'service' => [
@@ -130,6 +131,7 @@ protected function returnLegacyFormat(Server $server)
                 'swap' => (int) $server->swap,
                 'io' => (int) $server->io,
                 'cpu' => (int) $server->cpu,
+                'threads' => $server->threads,
                 'disk' => (int) $server->disk,
                 'image' => $server->image,
             ],

app/Services/Servers/ServerCreationService.php

@@ -242,6 +242,7 @@ private function createModel(array $data): Server
             'disk' => Arr::get($data, 'disk'),
             'io' => Arr::get($data, 'io'),
             'cpu' => Arr::get($data, 'cpu'),
+            'threads' => Arr::get($data, 'threads'),
             'oom_disabled' => Arr::get($data, 'oom_disabled', true),
             'allocation_id' => Arr::get($data, 'allocation_id'),
             'nest_id' => Arr::get($data, 'nest_id'),

app/Transformers/Api/Application/ServerTransformer.php

@@ -75,6 +75,7 @@ public function transform(Server $server): array
                 'disk' => $server->disk,
                 'io' => $server->io,
                 'cpu' => $server->cpu,
+                'threads' => $server->threads,
             ],
             'feature_limits' => [
                 'databases' => $server->database_limit,

resources/scripts/api/server/getServer.ts

@@ -24,6 +24,7 @@ export interface Server {
         disk: number;
         io: number;
         cpu: number;
+        threads: string;
     };
     featureLimits: {
         databases: number;

resources/views/admin/servers/new.blade.php

@@ -160,6 +160,13 @@
                             <span class="input-group-addon">%</span>
                         </div>
                     </div>
+                    <div class="form-group col-sm-4">
+                        <label for="pThreads">CPU Threads</label>
+                        <div class="input-group">
+                            <input type="text" class="form-control" value="{{ old('threads') }}" name="threads" id="pThreads" />
+                            <span class="input-group-addon"></span>
+                        </div>
+                    </div>
                     <div class="form-group col-sm-4">
                         <label for="pIO">Block IO Weight</label>
                         <div class="input-group">

resources/views/admin/servers/view/build.blade.php

@@ -26,7 +26,7 @@
         <div class="col-sm-5">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">System Resources</h3>
+                    <h3 class="box-title">Resource Management</h3>
                 </div>
                 <div class="box-body">
                     <div class="form-group">
@@ -53,6 +53,13 @@
                         </div>
                         <p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p>
                     </div>
+                    <div class="form-group">
+                        <label for="threads" class="control-label">CPU Threads</label>
+                        <div class="input-group">
+                            <input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
+                            <span class="input-group-addon"></span>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <label for="io" class="control-label">Block IO Proportion</label>
                         <div>