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

Cache hit/miss stats #1711

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Cache hit/miss stats #1711

merged 3 commits into from
Dec 18, 2023
+86 −17

Conversation

3Rafal
Copy link
Collaborator

@3Rafal 3Rafal commented Nov 22, 2023 •
edited
Loading

This PR adds cache statistics to merlin's telemetry, as in #1707
Example output:

"cache":{
   "reader_phase":"miss",
   "ppx_phase":"miss",
   "typer":{
      "reused":11,
      "typed":0
   },
   "cmt":{
      "hit":0,
      "miss":0
   },
   "cmi":{
      "hit":62,
      "miss":0
   }
}

voodoos
voodoos reviewed Dec 4, 2023
View reviewed changes
src/kernel/mpipeline.ml Outdated Show resolved Hide resolved
src/kernel/mpipeline.ml Outdated Show resolved Hide resolved
@3Rafal 3Rafal force-pushed the cache-stats branch 2 times, most recently from 1daec00 to 6a5adf2 Compare December 8, 2023 12:12
3Rafal added a commit to 3Rafal/merlin that referenced this pull request Dec 8, 2023
@3Rafal
Add changelog to ocaml#1711
fad7956
@3Rafal 3Rafal marked this pull request as ready for review December 8, 2023 12:17
3Rafal added a commit to 3Rafal/merlin that referenced this pull request Dec 11, 2023
@3Rafal
Add changelog to ocaml#1711
e22df37
@3Rafal
Copy link
Collaborator Author

3Rafal commented Dec 11, 2023

@voodoos , this PR is ready to be reviewed.

voodoos
voodoos reviewed Dec 11, 2023
View reviewed changes
src/kernel/mpipeline.ml Outdated Show resolved Hide resolved
src/kernel/mpipeline.ml Outdated Show resolved Hide resolved
src/kernel/mtyper.ml Outdated Show resolved Hide resolved
src/utils/file_cache.ml Outdated Show resolved Hide resolved
voodoos
voodoos reviewed Dec 12, 2023
View reviewed changes
src/kernel/mpipeline.ml Outdated Show resolved Hide resolved
3Rafal added a commit to 3Rafal/merlin that referenced this pull request Dec 13, 2023
@3Rafal
Apply review comments to ocaml#1711
189f28d
voodoos
voodoos approved these changes Dec 18, 2023
View reviewed changes
Copy link
Collaborator

@voodoos voodoos left a comment

Choose a reason for hiding this comment

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

Thanks Rafal !
Could you make a last rebase to fix the changelog conflict ?

@3Rafal
Copy link
Collaborator Author

3Rafal commented Dec 18, 2023

Thanks @voodoos , it should be good now :-)

@voodoos voodoos merged commit d0ea17f into ocaml:master Dec 18, 2023
6 of 7 checks passed
@pitag-ha pitag-ha mentioned this pull request Jan 29, 2024
Closed
2 tasks
voodoos added a commit to voodoos/merlin that referenced this pull request Feb 20, 2024
@voodoos
[B] Report cache hit/miss stats (ocaml#1711)
4ef5695 
from 3Rafal/cache-stats
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin (3 packages) (4.14-414)
1e53e68 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin, merlin-lib and dot-merlin-reader (4.14-500)
7905af8 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin (3 packages) (4.14-501)
613d86e 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin-lib, merlin (4.14-501/500/414)
6b881a5 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
@voodoos voodoos mentioned this pull request Feb 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pitag-ha pitag-ha pitag-ha left review comments

@voodoos voodoos voodoos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Backport to 501
Status: 4.14-500
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@3Rafal @voodoos @pitag-ha