Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 9c94fd7afb
Branches Tags
electron
/
patches
/
node
/
src_avoid_copying_string_in_fs_permission.patch

src_avoid_copying_string_in_fs_permission.patch 3.7 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Keeley Hammond <[email protected]>
    3. 

  3. Date: Mon, 6 Nov 2023 14:37:50 -0800
    4. 

  4. Subject: src: avoid copying string in fs_permission
    5. 

  5. 

  6. Ref: https://github.com/nodejs/node/pull/47746/files
    7. 

  7. 

  8. diff --git a/src/permission/fs_permission.cc b/src/permission/fs_permission.cc
    9. 

  9. index fadf75968c779d5aee8d9d1ee27e7b4abf241240..d407d440d74c66d9dc8ca4d4653096292c5adc4c 100644
    10. 

  10. --- a/src/permission/fs_permission.cc
    11. 

  11. +++ b/src/permission/fs_permission.cc
    12. 

  12. @@ -199,18 +199,18 @@ bool FSPermission::RadixTree::Lookup(const std::string_view& s,
    13. 

  13.    }
    14. 

  14.  }
    15. 

  15.  
    16. 

  16. -void FSPermission::RadixTree::Insert(const std::string& path) {
    17. 

  17. +void FSPermission::RadixTree::Insert(const std::string& path_prefix) {
    18. 

  18.    FSPermission::RadixTree::Node* current_node = root_node_;
    19. 

  19.  
    20. 

  20.    unsigned int parent_node_prefix_len = current_node->prefix.length();
    21. 

  21. -  int path_len = path.length();
    22. 

  22. +  int path_len = path_prefix.length();
    23. 

  23.  
    24. 

  24.    for (int i = 1; i <= path_len; ++i) {
    25. 

  25. -    bool is_wildcard_node = path[i - 1] == '*';
    26. 

  26. +    bool is_wildcard_node = path_prefix[i - 1] == '*';
    27. 

  27.      bool is_last_char = i == path_len;
    28. 

  28.  
    29. 

  29.      if (is_wildcard_node || is_last_char) {
    30. 

  30. -      std::string node_path = path.substr(parent_node_prefix_len, i);
    31. 

  31. +      std::string node_path = path_prefix.substr(parent_node_prefix_len, i);
    32. 

  32.        current_node = current_node->CreateChild(node_path);
    33. 

  33.      }
    34. 

  34.  
    35. 

  35. @@ -222,7 +222,7 @@ void FSPermission::RadixTree::Insert(const std::string& path) {
    36. 

  36.  
    37. 

  37.    if (UNLIKELY(per_process::enabled_debug_list.enabled(
    38. 

  38.            DebugCategory::PERMISSION_MODEL))) {
    39. 

  39. -    per_process::Debug(DebugCategory::PERMISSION_MODEL, "Inserting %s\n", path);
    40. 

  40. +    per_process::Debug(DebugCategory::PERMISSION_MODEL, "Inserting %s\n", path_prefix);
    41. 

  41.      PrintTree(root_node_);
    42. 

  42.    }
    43. 

  43.  }
    44. 

  44. diff --git a/src/permission/fs_permission.h b/src/permission/fs_permission.h
    45. 

  45. index 244e95727ad48757995c6404f457f42a4ba33ccd..4b6aab197333928bfbd5143bea15b3a5abd6d4c0 100644
    46. 

  46. --- a/src/permission/fs_permission.h
    47. 

  47. +++ b/src/permission/fs_permission.h
    48. 

  48. @@ -31,16 +31,16 @@ class FSPermission final : public PermissionBase {
    49. 

  49.  
    50. 

  50.        Node() : wildcard_child(nullptr), is_leaf(false) {}
    51. 

  51.  
    52. 

  52. -      Node* CreateChild(std::string prefix) {
    53. 

  53. -        if (prefix.empty() && !is_leaf) {
    54. 

  54. +      Node* CreateChild(std::string path_prefix) {
    55. 

  55. +        if (path_prefix.empty() && !is_leaf) {
    56. 

  56.            is_leaf = true;
    57. 

  57.            return this;
    58. 

  58.          }
    59. 

  59. -        char label = prefix[0];
    60. 

  60. +        char label = path_prefix[0];
    61. 

  61.  
    62. 

  62.          Node* child = children[label];
    63. 

  63.          if (child == nullptr) {
    64. 

  64. -          children[label] = new Node(prefix);
    65. 

  65. +          children[label] = new Node(path_prefix);
    66. 

  66.            return children[label];
    67. 

  67.          }
    68. 

  68.  
    69. 

  69. @@ -48,7 +48,7 @@ class FSPermission final : public PermissionBase {
    70. 

  70.          unsigned int i = 0;
    71. 

  71.          unsigned int prefix_len = prefix.length();
    72. 

  72.          for (; i < child->prefix.length(); ++i) {
    73. 

  73. -          if (i > prefix_len || prefix[i] != child->prefix[i]) {
    74. 

  74. +          if (i > prefix_len || path_prefix[i] != child->prefix[i]) {
    75. 

  75.              std::string parent_prefix = child->prefix.substr(0, i);
    76. 

  76.              std::string child_prefix = child->prefix.substr(i);
    77. 

  77.  
    78. 

  78. @@ -57,11 +57,11 @@ class FSPermission final : public PermissionBase {
    79. 

  79.              split_child->children[child_prefix[0]] = child;
    80. 

  80.              children[parent_prefix[0]] = split_child;
    81. 

  81.  
    82. 

  82. -            return split_child->CreateChild(prefix.substr(i));
    83. 

  83. +            return split_child->CreateChild(path_prefix.substr(i));
    84. 

  84.            }
    85. 

  85.          }
    86. 

  86.          child->is_leaf = true;
    87. 

  87. -        return child->CreateChild(prefix.substr(i));
    88. 

  88. +        return child->CreateChild(path_prefix.substr(i));
    89. 

  89.        }
    90. 

  90.  
    91. 

  91.        Node* CreateWildcardChild() {
    92.