perf: add Factories::get() v2 - #8600

Merged
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2
Mar 7, 2024
Merged

perf: add Factories::get() v2#8600
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2

Conversation

@kenjis

@kenjiskenjis commented Mar 2, 2024

Copy link
Copy Markdown
Member

Description
Supersedes #8598

  • add Factories::get() method to get the shared instance fast.
  • config() uses Factories::get()

I benchmarked #8598 and this PR on the Welcome page and there were no significant differences in the numbers.

4.5:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.48ms 23.59ms 92.93% Req/Sec 492.21 112.11 1.11k 60.36% 24613 requests in 5.10s, 410.38MB readRequests/sec: 4826.10Transfer/sec: 80.47MB

This PR:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.56ms 29.09ms 92.07% Req/Sec 497.06 106.24 676.00 57.00% 24766 requests in 5.01s, 412.93MB readRequests/sec: 4941.45Transfer/sec: 82.39MB
Details
diff --git a/app/Config/Services.php b/app/Config/Services.php
index df7c8ad086..f32b15b38a 100644
--- a/app/Config/Services.php+++ b/app/Config/Services.php@@ -2,6 +2,8 @@
namespace Config;
+use CodeIgniter\Autoloader\FileLocator;+use CodeIgniter\Autoloader\FileLocatorCached;
use CodeIgniter\Config\BaseService;
/**
@@ -19,14 +21,16 @@ use CodeIgniter\Config\BaseService;
*/
class Services extends BaseService
{
- /*- * public static function example($getShared = true)- * {- * if ($getShared) {- * return static::getSharedInstance('example');- * }- *- * return new \CodeIgniter\Example();- * }- */+ public static function locator(bool $getShared = true)+ {+ if ($getShared) {+ if (! isset(static::$instances['locator'])) {+ static::$instances['locator'] = new FileLocatorCached(new FileLocator(static::autoloader()));+ }++ return static::$mocks['locator'] ?? static::$instances['locator'];+ }++ return new FileLocator(static::autoloader());+ }
}
diff --git a/preload.php b/preload.php
index 63c781c220..73ae062668 100644
--- a/preload.php+++ b/preload.php@@ -49,7 +49,7 @@ class preload
*/
private array $paths = [
[
- 'include' => __DIR__ . '/vendor/codeigniter4/framework/system',+ 'include' => __DIR__ . '/system',
'exclude' => [
// Not needed if you don't use them.
'/system/Database/OCI8/',
@@ -69,6 +69,11 @@ class preload
'/system/ThirdParty/',
],
],
+ [+ 'include' => __DIR__ . '/vendor',+ 'exclude' => [],+ ],+
];
public function __construct()
diff --git a/public/index.php b/public/index.php
index 8cf5ce347c..eacaec8791 100644
--- a/public/index.php+++ b/public/index.php@@ -49,8 +49,8 @@ if (! defined('ENVIRONMENT')) {
}
// Load Config Cache
-// $factoriesCache = new \CodeIgniter\Cache\FactoriesCache();-// $factoriesCache->load('config');+$factoriesCache = new CodeIgniter\Cache\FactoriesCache();+$factoriesCache->load('config');
// ^^^ Uncomment these lines if you want to use Config Caching.
/*
@@ -79,7 +79,7 @@ $app->setContext($context);
$app->run();
// Save Config Cache
-// $factoriesCache->save('config');+$factoriesCache->save('config');
// ^^^ Uncomment this line if you want to use Config Caching.
// Exits the application, setting the exit code for CLI-based applications
$ sudo service apache2 restart
$ sudo service apache2 status
$ cat /etc/lsb-release DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=22.04
DISTRIB_CODENAME=jammy
DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
$ apache2 -v
Server version: Apache/2.4.52 (Ubuntu)
Server built: 2023-10-26T13:44:44
$ php -v
PHP 8.1.2-1ubuntu2.14 (cli) (built: Aug 18 2023 11:41:11) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.2, Copyright (c) Zend Technologies
with Zend OPcache v8.1.2-1ubuntu2.14, Copyright (c), by Zend Technologies

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

kenjis added 3 commits March 2, 2024 10:40
We should use $options['component'] because it takes precedence.
See the code below to create a shared instance.
@kenjiskenjis added the 4.5 label Mar 2, 2024
@kenjis
kenjis marked this pull request as draft March 2, 2024 08:15
@kenjis
kenjis marked this pull request as ready for review March 4, 2024 02:37
@kenjiskenjis added the refactor Pull requests that refactor code label Mar 4, 2024
$this->assertSame($config, Factories::get('config', 'App'));
}

public function testGetNonexistentInstance()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this really non-existent?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

No. Thanks!
Fixed the method name.

@kenjis
kenjis merged commit 48e0bea into codeigniter4:4.5Mar 7, 2024
@kenjis
kenjis deleted the feat-Factories-get-v2 branch March 7, 2024 07:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@lonnieezell@paulbalandan@ddevsr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

perf: add Factories::get() v2 - #8600

Merged
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2
Mar 7, 2024
Merged

perf: add Factories::get() v2#8600
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2

Conversation

@kenjis

@kenjiskenjis commented Mar 2, 2024

Copy link
Copy Markdown
Member

Description
Supersedes #8598

  • add Factories::get() method to get the shared instance fast.
  • config() uses Factories::get()

I benchmarked #8598 and this PR on the Welcome page and there were no significant differences in the numbers.

4.5:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.48ms 23.59ms 92.93% Req/Sec 492.21 112.11 1.11k 60.36% 24613 requests in 5.10s, 410.38MB readRequests/sec: 4826.10Transfer/sec: 80.47MB

This PR:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.56ms 29.09ms 92.07% Req/Sec 497.06 106.24 676.00 57.00% 24766 requests in 5.01s, 412.93MB readRequests/sec: 4941.45Transfer/sec: 82.39MB
Details
diff --git a/app/Config/Services.php b/app/Config/Services.php
index df7c8ad086..f32b15b38a 100644
--- a/app/Config/Services.php+++ b/app/Config/Services.php@@ -2,6 +2,8 @@
namespace Config;
+use CodeIgniter\Autoloader\FileLocator;+use CodeIgniter\Autoloader\FileLocatorCached;
use CodeIgniter\Config\BaseService;
/**
@@ -19,14 +21,16 @@ use CodeIgniter\Config\BaseService;
*/
class Services extends BaseService
{
- /*- * public static function example($getShared = true)- * {- * if ($getShared) {- * return static::getSharedInstance('example');- * }- *- * return new \CodeIgniter\Example();- * }- */+ public static function locator(bool $getShared = true)+ {+ if ($getShared) {+ if (! isset(static::$instances['locator'])) {+ static::$instances['locator'] = new FileLocatorCached(new FileLocator(static::autoloader()));+ }++ return static::$mocks['locator'] ?? static::$instances['locator'];+ }++ return new FileLocator(static::autoloader());+ }
}
diff --git a/preload.php b/preload.php
index 63c781c220..73ae062668 100644
--- a/preload.php+++ b/preload.php@@ -49,7 +49,7 @@ class preload
*/
private array $paths = [
[
- 'include' => __DIR__ . '/vendor/codeigniter4/framework/system',+ 'include' => __DIR__ . '/system',
'exclude' => [
// Not needed if you don't use them.
'/system/Database/OCI8/',
@@ -69,6 +69,11 @@ class preload
'/system/ThirdParty/',
],
],
+ [+ 'include' => __DIR__ . '/vendor',+ 'exclude' => [],+ ],+
];
public function __construct()
diff --git a/public/index.php b/public/index.php
index 8cf5ce347c..eacaec8791 100644
--- a/public/index.php+++ b/public/index.php@@ -49,8 +49,8 @@ if (! defined('ENVIRONMENT')) {
}
// Load Config Cache
-// $factoriesCache = new \CodeIgniter\Cache\FactoriesCache();-// $factoriesCache->load('config');+$factoriesCache = new CodeIgniter\Cache\FactoriesCache();+$factoriesCache->load('config');
// ^^^ Uncomment these lines if you want to use Config Caching.
/*
@@ -79,7 +79,7 @@ $app->setContext($context);
$app->run();
// Save Config Cache
-// $factoriesCache->save('config');+$factoriesCache->save('config');
// ^^^ Uncomment this line if you want to use Config Caching.
// Exits the application, setting the exit code for CLI-based applications
$ sudo service apache2 restart
$ sudo service apache2 status
$ cat /etc/lsb-release DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=22.04
DISTRIB_CODENAME=jammy
DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
$ apache2 -v
Server version: Apache/2.4.52 (Ubuntu)
Server built: 2023-10-26T13:44:44
$ php -v
PHP 8.1.2-1ubuntu2.14 (cli) (built: Aug 18 2023 11:41:11) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.2, Copyright (c) Zend Technologies
with Zend OPcache v8.1.2-1ubuntu2.14, Copyright (c), by Zend Technologies

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

kenjis added 3 commits March 2, 2024 10:40
We should use $options['component'] because it takes precedence.
See the code below to create a shared instance.
@kenjiskenjis added the 4.5 label Mar 2, 2024
@kenjis
kenjis marked this pull request as draft March 2, 2024 08:15
@kenjis
kenjis marked this pull request as ready for review March 4, 2024 02:37
@kenjiskenjis added the refactor Pull requests that refactor code label Mar 4, 2024
$this->assertSame($config, Factories::get('config', 'App'));
}

public function testGetNonexistentInstance()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this really non-existent?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

No. Thanks!
Fixed the method name.

@kenjis
kenjis merged commit 48e0bea into codeigniter4:4.5Mar 7, 2024
@kenjis
kenjis deleted the feat-Factories-get-v2 branch March 7, 2024 07:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@lonnieezell@paulbalandan@ddevsr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

perf: add Factories::get() v2 - #8600

Merged
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2
Mar 7, 2024
Merged

perf: add Factories::get() v2#8600
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2

Conversation

@kenjis

@kenjiskenjis commented Mar 2, 2024

Copy link
Copy Markdown
Member

Description
Supersedes #8598

  • add Factories::get() method to get the shared instance fast.
  • config() uses Factories::get()

I benchmarked #8598 and this PR on the Welcome page and there were no significant differences in the numbers.

4.5:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.48ms 23.59ms 92.93% Req/Sec 492.21 112.11 1.11k 60.36% 24613 requests in 5.10s, 410.38MB readRequests/sec: 4826.10Transfer/sec: 80.47MB

This PR:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.56ms 29.09ms 92.07% Req/Sec 497.06 106.24 676.00 57.00% 24766 requests in 5.01s, 412.93MB readRequests/sec: 4941.45Transfer/sec: 82.39MB
Details
diff --git a/app/Config/Services.php b/app/Config/Services.php
index df7c8ad086..f32b15b38a 100644
--- a/app/Config/Services.php+++ b/app/Config/Services.php@@ -2,6 +2,8 @@
namespace Config;
+use CodeIgniter\Autoloader\FileLocator;+use CodeIgniter\Autoloader\FileLocatorCached;
use CodeIgniter\Config\BaseService;
/**
@@ -19,14 +21,16 @@ use CodeIgniter\Config\BaseService;
*/
class Services extends BaseService
{
- /*- * public static function example($getShared = true)- * {- * if ($getShared) {- * return static::getSharedInstance('example');- * }- *- * return new \CodeIgniter\Example();- * }- */+ public static function locator(bool $getShared = true)+ {+ if ($getShared) {+ if (! isset(static::$instances['locator'])) {+ static::$instances['locator'] = new FileLocatorCached(new FileLocator(static::autoloader()));+ }++ return static::$mocks['locator'] ?? static::$instances['locator'];+ }++ return new FileLocator(static::autoloader());+ }
}
diff --git a/preload.php b/preload.php
index 63c781c220..73ae062668 100644
--- a/preload.php+++ b/preload.php@@ -49,7 +49,7 @@ class preload
*/
private array $paths = [
[
- 'include' => __DIR__ . '/vendor/codeigniter4/framework/system',+ 'include' => __DIR__ . '/system',
'exclude' => [
// Not needed if you don't use them.
'/system/Database/OCI8/',
@@ -69,6 +69,11 @@ class preload
'/system/ThirdParty/',
],
],
+ [+ 'include' => __DIR__ . '/vendor',+ 'exclude' => [],+ ],+
];
public function __construct()
diff --git a/public/index.php b/public/index.php
index 8cf5ce347c..eacaec8791 100644
--- a/public/index.php+++ b/public/index.php@@ -49,8 +49,8 @@ if (! defined('ENVIRONMENT')) {
}
// Load Config Cache
-// $factoriesCache = new \CodeIgniter\Cache\FactoriesCache();-// $factoriesCache->load('config');+$factoriesCache = new CodeIgniter\Cache\FactoriesCache();+$factoriesCache->load('config');
// ^^^ Uncomment these lines if you want to use Config Caching.
/*
@@ -79,7 +79,7 @@ $app->setContext($context);
$app->run();
// Save Config Cache
-// $factoriesCache->save('config');+$factoriesCache->save('config');
// ^^^ Uncomment this line if you want to use Config Caching.
// Exits the application, setting the exit code for CLI-based applications
$ sudo service apache2 restart
$ sudo service apache2 status
$ cat /etc/lsb-release DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=22.04
DISTRIB_CODENAME=jammy
DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
$ apache2 -v
Server version: Apache/2.4.52 (Ubuntu)
Server built: 2023-10-26T13:44:44
$ php -v
PHP 8.1.2-1ubuntu2.14 (cli) (built: Aug 18 2023 11:41:11) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.2, Copyright (c) Zend Technologies
with Zend OPcache v8.1.2-1ubuntu2.14, Copyright (c), by Zend Technologies

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

kenjis added 3 commits March 2, 2024 10:40
We should use $options['component'] because it takes precedence.
See the code below to create a shared instance.
@kenjiskenjis added the 4.5 label Mar 2, 2024
@kenjis
kenjis marked this pull request as draft March 2, 2024 08:15
@kenjis
kenjis marked this pull request as ready for review March 4, 2024 02:37
@kenjiskenjis added the refactor Pull requests that refactor code label Mar 4, 2024
$this->assertSame($config, Factories::get('config', 'App'));
}

public function testGetNonexistentInstance()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this really non-existent?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

No. Thanks!
Fixed the method name.

@kenjis
kenjis merged commit 48e0bea into codeigniter4:4.5Mar 7, 2024
@kenjis
kenjis deleted the feat-Factories-get-v2 branch March 7, 2024 07:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@lonnieezell@paulbalandan@ddevsr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

perf: add Factories::get() v2 - #8600

Merged
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2
Mar 7, 2024
Merged

perf: add Factories::get() v2#8600
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2

Conversation

@kenjis

@kenjiskenjis commented Mar 2, 2024

Copy link
Copy Markdown
Member

Description
Supersedes #8598

  • add Factories::get() method to get the shared instance fast.
  • config() uses Factories::get()

I benchmarked #8598 and this PR on the Welcome page and there were no significant differences in the numbers.

4.5:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.48ms 23.59ms 92.93% Req/Sec 492.21 112.11 1.11k 60.36% 24613 requests in 5.10s, 410.38MB readRequests/sec: 4826.10Transfer/sec: 80.47MB

This PR:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.56ms 29.09ms 92.07% Req/Sec 497.06 106.24 676.00 57.00% 24766 requests in 5.01s, 412.93MB readRequests/sec: 4941.45Transfer/sec: 82.39MB
Details
diff --git a/app/Config/Services.php b/app/Config/Services.php
index df7c8ad086..f32b15b38a 100644
--- a/app/Config/Services.php+++ b/app/Config/Services.php@@ -2,6 +2,8 @@
namespace Config;
+use CodeIgniter\Autoloader\FileLocator;+use CodeIgniter\Autoloader\FileLocatorCached;
use CodeIgniter\Config\BaseService;
/**
@@ -19,14 +21,16 @@ use CodeIgniter\Config\BaseService;
*/
class Services extends BaseService
{
- /*- * public static function example($getShared = true)- * {- * if ($getShared) {- * return static::getSharedInstance('example');- * }- *- * return new \CodeIgniter\Example();- * }- */+ public static function locator(bool $getShared = true)+ {+ if ($getShared) {+ if (! isset(static::$instances['locator'])) {+ static::$instances['locator'] = new FileLocatorCached(new FileLocator(static::autoloader()));+ }++ return static::$mocks['locator'] ?? static::$instances['locator'];+ }++ return new FileLocator(static::autoloader());+ }
}
diff --git a/preload.php b/preload.php
index 63c781c220..73ae062668 100644
--- a/preload.php+++ b/preload.php@@ -49,7 +49,7 @@ class preload
*/
private array $paths = [
[
- 'include' => __DIR__ . '/vendor/codeigniter4/framework/system',+ 'include' => __DIR__ . '/system',
'exclude' => [
// Not needed if you don't use them.
'/system/Database/OCI8/',
@@ -69,6 +69,11 @@ class preload
'/system/ThirdParty/',
],
],
+ [+ 'include' => __DIR__ . '/vendor',+ 'exclude' => [],+ ],+
];
public function __construct()
diff --git a/public/index.php b/public/index.php
index 8cf5ce347c..eacaec8791 100644
--- a/public/index.php+++ b/public/index.php@@ -49,8 +49,8 @@ if (! defined('ENVIRONMENT')) {
}
// Load Config Cache
-// $factoriesCache = new \CodeIgniter\Cache\FactoriesCache();-// $factoriesCache->load('config');+$factoriesCache = new CodeIgniter\Cache\FactoriesCache();+$factoriesCache->load('config');
// ^^^ Uncomment these lines if you want to use Config Caching.
/*
@@ -79,7 +79,7 @@ $app->setContext($context);
$app->run();
// Save Config Cache
-// $factoriesCache->save('config');+$factoriesCache->save('config');
// ^^^ Uncomment this line if you want to use Config Caching.
// Exits the application, setting the exit code for CLI-based applications
$ sudo service apache2 restart
$ sudo service apache2 status
$ cat /etc/lsb-release DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=22.04
DISTRIB_CODENAME=jammy
DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
$ apache2 -v
Server version: Apache/2.4.52 (Ubuntu)
Server built: 2023-10-26T13:44:44
$ php -v
PHP 8.1.2-1ubuntu2.14 (cli) (built: Aug 18 2023 11:41:11) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.2, Copyright (c) Zend Technologies
with Zend OPcache v8.1.2-1ubuntu2.14, Copyright (c), by Zend Technologies

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

kenjis added 3 commits March 2, 2024 10:40
We should use $options['component'] because it takes precedence.
See the code below to create a shared instance.
@kenjiskenjis added the 4.5 label Mar 2, 2024
@kenjis
kenjis marked this pull request as draft March 2, 2024 08:15
@kenjis
kenjis marked this pull request as ready for review March 4, 2024 02:37
@kenjiskenjis added the refactor Pull requests that refactor code label Mar 4, 2024
$this->assertSame($config, Factories::get('config', 'App'));
}

public function testGetNonexistentInstance()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this really non-existent?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

No. Thanks!
Fixed the method name.

@kenjis
kenjis merged commit 48e0bea into codeigniter4:4.5Mar 7, 2024
@kenjis
kenjis deleted the feat-Factories-get-v2 branch March 7, 2024 07:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@lonnieezell@paulbalandan@ddevsr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

perf: add Factories::get() v2 - #8600

Merged
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2
Mar 7, 2024
Merged

perf: add Factories::get() v2#8600
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2

Conversation

@kenjis

@kenjiskenjis commented Mar 2, 2024

Copy link
Copy Markdown
Member

Description
Supersedes #8598

  • add Factories::get() method to get the shared instance fast.
  • config() uses Factories::get()

I benchmarked #8598 and this PR on the Welcome page and there were no significant differences in the numbers.

4.5:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.48ms 23.59ms 92.93% Req/Sec 492.21 112.11 1.11k 60.36% 24613 requests in 5.10s, 410.38MB readRequests/sec: 4826.10Transfer/sec: 80.47MB

This PR:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.56ms 29.09ms 92.07% Req/Sec 497.06 106.24 676.00 57.00% 24766 requests in 5.01s, 412.93MB readRequests/sec: 4941.45Transfer/sec: 82.39MB
Details
diff --git a/app/Config/Services.php b/app/Config/Services.php
index df7c8ad086..f32b15b38a 100644
--- a/app/Config/Services.php+++ b/app/Config/Services.php@@ -2,6 +2,8 @@
namespace Config;
+use CodeIgniter\Autoloader\FileLocator;+use CodeIgniter\Autoloader\FileLocatorCached;
use CodeIgniter\Config\BaseService;
/**
@@ -19,14 +21,16 @@ use CodeIgniter\Config\BaseService;
*/
class Services extends BaseService
{
- /*- * public static function example($getShared = true)- * {- * if ($getShared) {- * return static::getSharedInstance('example');- * }- *- * return new \CodeIgniter\Example();- * }- */+ public static function locator(bool $getShared = true)+ {+ if ($getShared) {+ if (! isset(static::$instances['locator'])) {+ static::$instances['locator'] = new FileLocatorCached(new FileLocator(static::autoloader()));+ }++ return static::$mocks['locator'] ?? static::$instances['locator'];+ }++ return new FileLocator(static::autoloader());+ }
}
diff --git a/preload.php b/preload.php
index 63c781c220..73ae062668 100644
--- a/preload.php+++ b/preload.php@@ -49,7 +49,7 @@ class preload
*/
private array $paths = [
[
- 'include' => __DIR__ . '/vendor/codeigniter4/framework/system',+ 'include' => __DIR__ . '/system',
'exclude' => [
// Not needed if you don't use them.
'/system/Database/OCI8/',
@@ -69,6 +69,11 @@ class preload
'/system/ThirdParty/',
],
],
+ [+ 'include' => __DIR__ . '/vendor',+ 'exclude' => [],+ ],+
];
public function __construct()
diff --git a/public/index.php b/public/index.php
index 8cf5ce347c..eacaec8791 100644
--- a/public/index.php+++ b/public/index.php@@ -49,8 +49,8 @@ if (! defined('ENVIRONMENT')) {
}
// Load Config Cache
-// $factoriesCache = new \CodeIgniter\Cache\FactoriesCache();-// $factoriesCache->load('config');+$factoriesCache = new CodeIgniter\Cache\FactoriesCache();+$factoriesCache->load('config');
// ^^^ Uncomment these lines if you want to use Config Caching.
/*
@@ -79,7 +79,7 @@ $app->setContext($context);
$app->run();
// Save Config Cache
-// $factoriesCache->save('config');+$factoriesCache->save('config');
// ^^^ Uncomment this line if you want to use Config Caching.
// Exits the application, setting the exit code for CLI-based applications
$ sudo service apache2 restart
$ sudo service apache2 status
$ cat /etc/lsb-release DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=22.04
DISTRIB_CODENAME=jammy
DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
$ apache2 -v
Server version: Apache/2.4.52 (Ubuntu)
Server built: 2023-10-26T13:44:44
$ php -v
PHP 8.1.2-1ubuntu2.14 (cli) (built: Aug 18 2023 11:41:11) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.2, Copyright (c) Zend Technologies
with Zend OPcache v8.1.2-1ubuntu2.14, Copyright (c), by Zend Technologies

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

kenjis added 3 commits March 2, 2024 10:40
We should use $options['component'] because it takes precedence.
See the code below to create a shared instance.
@kenjiskenjis added the 4.5 label Mar 2, 2024
@kenjis
kenjis marked this pull request as draft March 2, 2024 08:15
@kenjis
kenjis marked this pull request as ready for review March 4, 2024 02:37
@kenjiskenjis added the refactor Pull requests that refactor code label Mar 4, 2024
$this->assertSame($config, Factories::get('config', 'App'));
}

public function testGetNonexistentInstance()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this really non-existent?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

No. Thanks!
Fixed the method name.

@kenjis
kenjis merged commit 48e0bea into codeigniter4:4.5Mar 7, 2024
@kenjis
kenjis deleted the feat-Factories-get-v2 branch March 7, 2024 07:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@lonnieezell@paulbalandan@ddevsr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

perf: add Factories::get() v2 - #8600

Merged
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2
Mar 7, 2024
Merged

perf: add Factories::get() v2#8600
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2

Conversation

@kenjis

@kenjiskenjis commented Mar 2, 2024

Copy link
Copy Markdown
Member

Description
Supersedes #8598

  • add Factories::get() method to get the shared instance fast.
  • config() uses Factories::get()

I benchmarked #8598 and this PR on the Welcome page and there were no significant differences in the numbers.

4.5:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.48ms 23.59ms 92.93% Req/Sec 492.21 112.11 1.11k 60.36% 24613 requests in 5.10s, 410.38MB readRequests/sec: 4826.10Transfer/sec: 80.47MB

This PR:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.56ms 29.09ms 92.07% Req/Sec 497.06 106.24 676.00 57.00% 24766 requests in 5.01s, 412.93MB readRequests/sec: 4941.45Transfer/sec: 82.39MB
Details
diff --git a/app/Config/Services.php b/app/Config/Services.php
index df7c8ad086..f32b15b38a 100644
--- a/app/Config/Services.php+++ b/app/Config/Services.php@@ -2,6 +2,8 @@
namespace Config;
+use CodeIgniter\Autoloader\FileLocator;+use CodeIgniter\Autoloader\FileLocatorCached;
use CodeIgniter\Config\BaseService;
/**
@@ -19,14 +21,16 @@ use CodeIgniter\Config\BaseService;
*/
class Services extends BaseService
{
- /*- * public static function example($getShared = true)- * {- * if ($getShared) {- * return static::getSharedInstance('example');- * }- *- * return new \CodeIgniter\Example();- * }- */+ public static function locator(bool $getShared = true)+ {+ if ($getShared) {+ if (! isset(static::$instances['locator'])) {+ static::$instances['locator'] = new FileLocatorCached(new FileLocator(static::autoloader()));+ }++ return static::$mocks['locator'] ?? static::$instances['locator'];+ }++ return new FileLocator(static::autoloader());+ }
}
diff --git a/preload.php b/preload.php
index 63c781c220..73ae062668 100644
--- a/preload.php+++ b/preload.php@@ -49,7 +49,7 @@ class preload
*/
private array $paths = [
[
- 'include' => __DIR__ . '/vendor/codeigniter4/framework/system',+ 'include' => __DIR__ . '/system',
'exclude' => [
// Not needed if you don't use them.
'/system/Database/OCI8/',
@@ -69,6 +69,11 @@ class preload
'/system/ThirdParty/',
],
],
+ [+ 'include' => __DIR__ . '/vendor',+ 'exclude' => [],+ ],+
];
public function __construct()
diff --git a/public/index.php b/public/index.php
index 8cf5ce347c..eacaec8791 100644
--- a/public/index.php+++ b/public/index.php@@ -49,8 +49,8 @@ if (! defined('ENVIRONMENT')) {
}
// Load Config Cache
-// $factoriesCache = new \CodeIgniter\Cache\FactoriesCache();-// $factoriesCache->load('config');+$factoriesCache = new CodeIgniter\Cache\FactoriesCache();+$factoriesCache->load('config');
// ^^^ Uncomment these lines if you want to use Config Caching.
/*
@@ -79,7 +79,7 @@ $app->setContext($context);
$app->run();
// Save Config Cache
-// $factoriesCache->save('config');+$factoriesCache->save('config');
// ^^^ Uncomment this line if you want to use Config Caching.
// Exits the application, setting the exit code for CLI-based applications
$ sudo service apache2 restart
$ sudo service apache2 status
$ cat /etc/lsb-release DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=22.04
DISTRIB_CODENAME=jammy
DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
$ apache2 -v
Server version: Apache/2.4.52 (Ubuntu)
Server built: 2023-10-26T13:44:44
$ php -v
PHP 8.1.2-1ubuntu2.14 (cli) (built: Aug 18 2023 11:41:11) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.2, Copyright (c) Zend Technologies
with Zend OPcache v8.1.2-1ubuntu2.14, Copyright (c), by Zend Technologies

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

kenjis added 3 commits March 2, 2024 10:40
We should use $options['component'] because it takes precedence.
See the code below to create a shared instance.
@kenjiskenjis added the 4.5 label Mar 2, 2024
@kenjis
kenjis marked this pull request as draft March 2, 2024 08:15
@kenjis
kenjis marked this pull request as ready for review March 4, 2024 02:37
@kenjiskenjis added the refactor Pull requests that refactor code label Mar 4, 2024
$this->assertSame($config, Factories::get('config', 'App'));
}

public function testGetNonexistentInstance()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this really non-existent?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

No. Thanks!
Fixed the method name.

@kenjis
kenjis merged commit 48e0bea into codeigniter4:4.5Mar 7, 2024
@kenjis
kenjis deleted the feat-Factories-get-v2 branch March 7, 2024 07:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@lonnieezell@paulbalandan@ddevsr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

perf: add Factories::get() v2 - #8600

Merged
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2
Mar 7, 2024
Merged

perf: add Factories::get() v2#8600
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2

Conversation

@kenjis

@kenjiskenjis commented Mar 2, 2024

Copy link
Copy Markdown
Member

Description
Supersedes #8598

  • add Factories::get() method to get the shared instance fast.
  • config() uses Factories::get()

I benchmarked #8598 and this PR on the Welcome page and there were no significant differences in the numbers.

4.5:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.48ms 23.59ms 92.93% Req/Sec 492.21 112.11 1.11k 60.36% 24613 requests in 5.10s, 410.38MB readRequests/sec: 4826.10Transfer/sec: 80.47MB

This PR:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.56ms 29.09ms 92.07% Req/Sec 497.06 106.24 676.00 57.00% 24766 requests in 5.01s, 412.93MB readRequests/sec: 4941.45Transfer/sec: 82.39MB
Details
diff --git a/app/Config/Services.php b/app/Config/Services.php
index df7c8ad086..f32b15b38a 100644
--- a/app/Config/Services.php+++ b/app/Config/Services.php@@ -2,6 +2,8 @@
namespace Config;
+use CodeIgniter\Autoloader\FileLocator;+use CodeIgniter\Autoloader\FileLocatorCached;
use CodeIgniter\Config\BaseService;
/**
@@ -19,14 +21,16 @@ use CodeIgniter\Config\BaseService;
*/
class Services extends BaseService
{
- /*- * public static function example($getShared = true)- * {- * if ($getShared) {- * return static::getSharedInstance('example');- * }- *- * return new \CodeIgniter\Example();- * }- */+ public static function locator(bool $getShared = true)+ {+ if ($getShared) {+ if (! isset(static::$instances['locator'])) {+ static::$instances['locator'] = new FileLocatorCached(new FileLocator(static::autoloader()));+ }++ return static::$mocks['locator'] ?? static::$instances['locator'];+ }++ return new FileLocator(static::autoloader());+ }
}
diff --git a/preload.php b/preload.php
index 63c781c220..73ae062668 100644
--- a/preload.php+++ b/preload.php@@ -49,7 +49,7 @@ class preload
*/
private array $paths = [
[
- 'include' => __DIR__ . '/vendor/codeigniter4/framework/system',+ 'include' => __DIR__ . '/system',
'exclude' => [
// Not needed if you don't use them.
'/system/Database/OCI8/',
@@ -69,6 +69,11 @@ class preload
'/system/ThirdParty/',
],
],
+ [+ 'include' => __DIR__ . '/vendor',+ 'exclude' => [],+ ],+
];
public function __construct()
diff --git a/public/index.php b/public/index.php
index 8cf5ce347c..eacaec8791 100644
--- a/public/index.php+++ b/public/index.php@@ -49,8 +49,8 @@ if (! defined('ENVIRONMENT')) {
}
// Load Config Cache
-// $factoriesCache = new \CodeIgniter\Cache\FactoriesCache();-// $factoriesCache->load('config');+$factoriesCache = new CodeIgniter\Cache\FactoriesCache();+$factoriesCache->load('config');
// ^^^ Uncomment these lines if you want to use Config Caching.
/*
@@ -79,7 +79,7 @@ $app->setContext($context);
$app->run();
// Save Config Cache
-// $factoriesCache->save('config');+$factoriesCache->save('config');
// ^^^ Uncomment this line if you want to use Config Caching.
// Exits the application, setting the exit code for CLI-based applications
$ sudo service apache2 restart
$ sudo service apache2 status
$ cat /etc/lsb-release DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=22.04
DISTRIB_CODENAME=jammy
DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
$ apache2 -v
Server version: Apache/2.4.52 (Ubuntu)
Server built: 2023-10-26T13:44:44
$ php -v
PHP 8.1.2-1ubuntu2.14 (cli) (built: Aug 18 2023 11:41:11) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.2, Copyright (c) Zend Technologies
with Zend OPcache v8.1.2-1ubuntu2.14, Copyright (c), by Zend Technologies

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

kenjis added 3 commits March 2, 2024 10:40
We should use $options['component'] because it takes precedence.
See the code below to create a shared instance.
@kenjiskenjis added the 4.5 label Mar 2, 2024
@kenjis
kenjis marked this pull request as draft March 2, 2024 08:15
@kenjis
kenjis marked this pull request as ready for review March 4, 2024 02:37
@kenjiskenjis added the refactor Pull requests that refactor code label Mar 4, 2024
$this->assertSame($config, Factories::get('config', 'App'));
}

public function testGetNonexistentInstance()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this really non-existent?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

No. Thanks!
Fixed the method name.

@kenjis
kenjis merged commit 48e0bea into codeigniter4:4.5Mar 7, 2024
@kenjis
kenjis deleted the feat-Factories-get-v2 branch March 7, 2024 07:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@lonnieezell@paulbalandan@ddevsr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

perf: add Factories::get() v2 - #8600

Merged
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2
Mar 7, 2024
Merged

perf: add Factories::get() v2#8600
kenjis merged 5 commits into
codeigniter4:4.5from
kenjis:feat-Factories-get-v2

Conversation

@kenjis

@kenjiskenjis commented Mar 2, 2024

Copy link
Copy Markdown
Member

Description
Supersedes #8598

  • add Factories::get() method to get the shared instance fast.
  • config() uses Factories::get()

I benchmarked #8598 and this PR on the Welcome page and there were no significant differences in the numbers.

4.5:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.48ms 23.59ms 92.93% Req/Sec 492.21 112.11 1.11k 60.36% 24613 requests in 5.10s, 410.38MB readRequests/sec: 4826.10Transfer/sec: 80.47MB

This PR:

$ wrk -t10 -d5s http://localhost/CodeIgniter4/Running 5s test @ http://localhost/CodeIgniter4/ 10 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 2.19ms 1.56ms 29.09ms 92.07% Req/Sec 497.06 106.24 676.00 57.00% 24766 requests in 5.01s, 412.93MB readRequests/sec: 4941.45Transfer/sec: 82.39MB
Details
diff --git a/app/Config/Services.php b/app/Config/Services.php
index df7c8ad086..f32b15b38a 100644
--- a/app/Config/Services.php+++ b/app/Config/Services.php@@ -2,6 +2,8 @@
namespace Config;
+use CodeIgniter\Autoloader\FileLocator;+use CodeIgniter\Autoloader\FileLocatorCached;
use CodeIgniter\Config\BaseService;
/**
@@ -19,14 +21,16 @@ use CodeIgniter\Config\BaseService;
*/
class Services extends BaseService
{
- /*- * public static function example($getShared = true)- * {- * if ($getShared) {- * return static::getSharedInstance('example');- * }- *- * return new \CodeIgniter\Example();- * }- */+ public static function locator(bool $getShared = true)+ {+ if ($getShared) {+ if (! isset(static::$instances['locator'])) {+ static::$instances['locator'] = new FileLocatorCached(new FileLocator(static::autoloader()));+ }++ return static::$mocks['locator'] ?? static::$instances['locator'];+ }++ return new FileLocator(static::autoloader());+ }
}
diff --git a/preload.php b/preload.php
index 63c781c220..73ae062668 100644
--- a/preload.php+++ b/preload.php@@ -49,7 +49,7 @@ class preload
*/
private array $paths = [
[
- 'include' => __DIR__ . '/vendor/codeigniter4/framework/system',+ 'include' => __DIR__ . '/system',
'exclude' => [
// Not needed if you don't use them.
'/system/Database/OCI8/',
@@ -69,6 +69,11 @@ class preload
'/system/ThirdParty/',
],
],
+ [+ 'include' => __DIR__ . '/vendor',+ 'exclude' => [],+ ],+
];
public function __construct()
diff --git a/public/index.php b/public/index.php
index 8cf5ce347c..eacaec8791 100644
--- a/public/index.php+++ b/public/index.php@@ -49,8 +49,8 @@ if (! defined('ENVIRONMENT')) {
}
// Load Config Cache
-// $factoriesCache = new \CodeIgniter\Cache\FactoriesCache();-// $factoriesCache->load('config');+$factoriesCache = new CodeIgniter\Cache\FactoriesCache();+$factoriesCache->load('config');
// ^^^ Uncomment these lines if you want to use Config Caching.
/*
@@ -79,7 +79,7 @@ $app->setContext($context);
$app->run();
// Save Config Cache
-// $factoriesCache->save('config');+$factoriesCache->save('config');
// ^^^ Uncomment this line if you want to use Config Caching.
// Exits the application, setting the exit code for CLI-based applications
$ sudo service apache2 restart
$ sudo service apache2 status
$ cat /etc/lsb-release DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=22.04
DISTRIB_CODENAME=jammy
DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
$ apache2 -v
Server version: Apache/2.4.52 (Ubuntu)
Server built: 2023-10-26T13:44:44
$ php -v
PHP 8.1.2-1ubuntu2.14 (cli) (built: Aug 18 2023 11:41:11) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.2, Copyright (c) Zend Technologies
with Zend OPcache v8.1.2-1ubuntu2.14, Copyright (c), by Zend Technologies

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

kenjis added 3 commits March 2, 2024 10:40
We should use $options['component'] because it takes precedence.
See the code below to create a shared instance.
@kenjiskenjis added the 4.5 label Mar 2, 2024
@kenjis
kenjis marked this pull request as draft March 2, 2024 08:15
@kenjis
kenjis marked this pull request as ready for review March 4, 2024 02:37
@kenjiskenjis added the refactor Pull requests that refactor code label Mar 4, 2024
$this->assertSame($config, Factories::get('config', 'App'));
}

public function testGetNonexistentInstance()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this really non-existent?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

No. Thanks!
Fixed the method name.

@kenjis
kenjis merged commit 48e0bea into codeigniter4:4.5Mar 7, 2024
@kenjis
kenjis deleted the feat-Factories-get-v2 branch March 7, 2024 07:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@lonnieezell@paulbalandan@ddevsr