pyroscope_beta 0.1.4-x86_64-linux → 0.1.9-x86_64-linux

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 83c1674cc8a4d329e472ca540a29c155e43751b7d2b354e1ee7d4a40bca8874b
4
- data.tar.gz: 2543d0eceaef01935a815ee147573b9c8e60b0475f9052c029cf0ad3af4a65cd
3
+ metadata.gz: f5797523af0c37d359fcef35a8f5b7bfcbd8c8b78c01a4fe893e6bce1f5c18e3
4
+ data.tar.gz: 8651c68e3282c079b6b79717852760fd919b01cf9913901911378afe93b91237
5
5
  SHA512:
6
- metadata.gz: a333ce34f384d51e7c9b5fb32aba1e9b48606f4a6080ed57cd2e6eaa106c9a5cadfa1e3f6060b5d56e017d170cbbee392fb12d90f1275c54a8ff7fe24fa0b961
7
- data.tar.gz: d7bdf3de185cecae246a1ade93da2cf010189b585d5172ddc93c314160538dec2f6e81a3b597b87d133fedbe61864704c064a2d1839a893d85f8c4aa0ecf0bdd
6
+ metadata.gz: 2dd159aa5f65b561bc970c8c5a5a7907ba3becea6d64709dc9be7f6203d4201bf58fa475bca9d3f0a81bbaf6a4e98df4deecdf4c63747da5125f8fdb32ec3a35
7
+ data.tar.gz: 190e673603a7b60bf8ae07bf4535d0cdd2c451331f64597dac45e132900bc0df960768633dc7ed54808ae76e576156665f964eb708a0f794e8d6eef57856e888
data/ext/rbspy/Cargo.lock CHANGED
@@ -120,9 +120,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
120
120
 
121
121
  [[package]]
122
122
  name = "bumpalo"
123
- version = "3.9.1"
123
+ version = "3.10.0"
124
124
  source = "registry+https://github.com/rust-lang/crates.io-index"
125
- checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
125
+ checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
126
126
 
127
127
  [[package]]
128
128
  name = "bytemuck"
@@ -178,9 +178,9 @@ dependencies = [
178
178
 
179
179
  [[package]]
180
180
  name = "clang-sys"
181
- version = "1.3.1"
181
+ version = "1.3.3"
182
182
  source = "registry+https://github.com/rust-lang/crates.io-index"
183
- checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21"
183
+ checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b"
184
184
  dependencies = [
185
185
  "glob",
186
186
  "libc",
@@ -204,9 +204,9 @@ dependencies = [
204
204
 
205
205
  [[package]]
206
206
  name = "clap"
207
- version = "3.1.14"
207
+ version = "3.1.18"
208
208
  source = "registry+https://github.com/rust-lang/crates.io-index"
209
- checksum = "535434c063ced786eb04aaf529308092c5ab60889e8fe24275d15de07b01fa97"
209
+ checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b"
210
210
  dependencies = [
211
211
  "atty",
212
212
  "bitflags",
@@ -221,9 +221,9 @@ dependencies = [
221
221
 
222
222
  [[package]]
223
223
  name = "clap_derive"
224
- version = "3.1.7"
224
+ version = "3.1.18"
225
225
  source = "registry+https://github.com/rust-lang/crates.io-index"
226
- checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
226
+ checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c"
227
227
  dependencies = [
228
228
  "heck",
229
229
  "proc-macro-error",
@@ -307,13 +307,14 @@ dependencies = [
307
307
 
308
308
  [[package]]
309
309
  name = "dashmap"
310
- version = "5.3.2"
310
+ version = "5.3.4"
311
311
  source = "registry+https://github.com/rust-lang/crates.io-index"
312
- checksum = "94b5a84352d6654d195b2365e38b5a7eacfdca4ad1b375196a1f76c6d7dd01ce"
312
+ checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f"
313
313
  dependencies = [
314
314
  "cfg-if",
315
- "hashbrown 0.12.0",
315
+ "hashbrown 0.12.1",
316
316
  "lock_api",
317
+ "parking_lot_core",
317
318
  ]
318
319
 
319
320
  [[package]]
@@ -411,13 +412,11 @@ dependencies = [
411
412
 
412
413
  [[package]]
413
414
  name = "flate2"
414
- version = "1.0.23"
415
+ version = "1.0.24"
415
416
  source = "registry+https://github.com/rust-lang/crates.io-index"
416
- checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
417
+ checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
417
418
  dependencies = [
418
- "cfg-if",
419
419
  "crc32fast",
420
- "libc",
421
420
  "miniz_oxide",
422
421
  ]
423
422
 
@@ -535,9 +534,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
535
534
 
536
535
  [[package]]
537
536
  name = "goblin"
538
- version = "0.5.1"
537
+ version = "0.5.2"
539
538
  source = "registry+https://github.com/rust-lang/crates.io-index"
540
- checksum = "c955ab4e0ad8c843ea653a3d143048b87490d9be56bd7132a435c2407846ac8f"
539
+ checksum = "cfeb764aa29a0774d290c2df134a37ab2e3c1ba59009162626658aabefda321a"
541
540
  dependencies = [
542
541
  "log",
543
542
  "plain",
@@ -571,9 +570,9 @@ checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
571
570
 
572
571
  [[package]]
573
572
  name = "hashbrown"
574
- version = "0.12.0"
573
+ version = "0.12.1"
575
574
  source = "registry+https://github.com/rust-lang/crates.io-index"
576
- checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
575
+ checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
577
576
 
578
577
  [[package]]
579
578
  name = "heck"
@@ -592,20 +591,20 @@ dependencies = [
592
591
 
593
592
  [[package]]
594
593
  name = "http"
595
- version = "0.2.7"
594
+ version = "0.2.8"
596
595
  source = "registry+https://github.com/rust-lang/crates.io-index"
597
- checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
596
+ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
598
597
  dependencies = [
599
598
  "bytes",
600
599
  "fnv",
601
- "itoa 1.0.1",
600
+ "itoa 1.0.2",
602
601
  ]
603
602
 
604
603
  [[package]]
605
604
  name = "http-body"
606
- version = "0.4.4"
605
+ version = "0.4.5"
607
606
  source = "registry+https://github.com/rust-lang/crates.io-index"
608
- checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
607
+ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
609
608
  dependencies = [
610
609
  "bytes",
611
610
  "http",
@@ -632,9 +631,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
632
631
 
633
632
  [[package]]
634
633
  name = "hyper"
635
- version = "0.14.18"
634
+ version = "0.14.19"
636
635
  source = "registry+https://github.com/rust-lang/crates.io-index"
637
- checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
636
+ checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f"
638
637
  dependencies = [
639
638
  "bytes",
640
639
  "futures-channel",
@@ -645,7 +644,7 @@ dependencies = [
645
644
  "http-body",
646
645
  "httparse",
647
646
  "httpdate",
648
- "itoa 1.0.1",
647
+ "itoa 1.0.2",
649
648
  "pin-project-lite",
650
649
  "socket2",
651
650
  "tokio",
@@ -654,6 +653,19 @@ dependencies = [
654
653
  "want",
655
654
  ]
656
655
 
656
+ [[package]]
657
+ name = "hyper-rustls"
658
+ version = "0.23.0"
659
+ source = "registry+https://github.com/rust-lang/crates.io-index"
660
+ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
661
+ dependencies = [
662
+ "http",
663
+ "hyper",
664
+ "rustls",
665
+ "tokio",
666
+ "tokio-rustls",
667
+ ]
668
+
657
669
  [[package]]
658
670
  name = "hyper-tls"
659
671
  version = "0.5.0"
@@ -680,9 +692,9 @@ dependencies = [
680
692
 
681
693
  [[package]]
682
694
  name = "indexmap"
683
- version = "1.8.1"
695
+ version = "1.8.2"
684
696
  source = "registry+https://github.com/rust-lang/crates.io-index"
685
- checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
697
+ checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
686
698
  dependencies = [
687
699
  "autocfg",
688
700
  "hashbrown 0.11.2",
@@ -690,19 +702,19 @@ dependencies = [
690
702
 
691
703
  [[package]]
692
704
  name = "inferno"
693
- version = "0.11.2"
705
+ version = "0.11.4"
694
706
  source = "registry+https://github.com/rust-lang/crates.io-index"
695
- checksum = "89efa0d58cc7d17076d8fcaa4ea2b408a799eaed1682e1d60b8a9e03a061be82"
707
+ checksum = "1a3cb215599901c8f491666421d44ffaed08d6872b4c7ced6f425683b951271e"
696
708
  dependencies = [
697
709
  "ahash",
698
710
  "atty",
699
- "clap 3.1.14",
711
+ "clap 3.1.18",
700
712
  "crossbeam-channel",
701
713
  "crossbeam-utils",
702
714
  "dashmap",
703
715
  "env_logger",
704
716
  "indexmap",
705
- "itoa 1.0.1",
717
+ "itoa 1.0.2",
706
718
  "lazy_static",
707
719
  "log",
708
720
  "num-format",
@@ -744,9 +756,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
744
756
 
745
757
  [[package]]
746
758
  name = "itoa"
747
- version = "1.0.1"
759
+ version = "1.0.2"
748
760
  source = "registry+https://github.com/rust-lang/crates.io-index"
749
- checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
761
+ checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
750
762
 
751
763
  [[package]]
752
764
  name = "js-sys"
@@ -771,9 +783,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
771
783
 
772
784
  [[package]]
773
785
  name = "libc"
774
- version = "0.2.125"
786
+ version = "0.2.126"
775
787
  source = "registry+https://github.com/rust-lang/crates.io-index"
776
- checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
788
+ checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
777
789
 
778
790
  [[package]]
779
791
  name = "libloading"
@@ -818,9 +830,9 @@ dependencies = [
818
830
 
819
831
  [[package]]
820
832
  name = "log"
821
- version = "0.4.16"
833
+ version = "0.4.17"
822
834
  source = "registry+https://github.com/rust-lang/crates.io-index"
823
- checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
835
+ checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
824
836
  dependencies = [
825
837
  "cfg-if",
826
838
  ]
@@ -834,6 +846,15 @@ dependencies = [
834
846
  "libc",
835
847
  ]
836
848
 
849
+ [[package]]
850
+ name = "mach2"
851
+ version = "0.4.1"
852
+ source = "registry+https://github.com/rust-lang/crates.io-index"
853
+ checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
854
+ dependencies = [
855
+ "libc",
856
+ ]
857
+
837
858
  [[package]]
838
859
  name = "mach_o_sys"
839
860
  version = "0.1.1"
@@ -885,34 +906,33 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
885
906
 
886
907
  [[package]]
887
908
  name = "miniz_oxide"
888
- version = "0.5.1"
909
+ version = "0.5.3"
889
910
  source = "registry+https://github.com/rust-lang/crates.io-index"
890
- checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
911
+ checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
891
912
  dependencies = [
892
913
  "adler",
893
914
  ]
894
915
 
895
916
  [[package]]
896
917
  name = "mio"
897
- version = "0.8.2"
918
+ version = "0.8.3"
898
919
  source = "registry+https://github.com/rust-lang/crates.io-index"
899
- checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
920
+ checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
900
921
  dependencies = [
901
922
  "libc",
902
923
  "log",
903
- "miow",
904
- "ntapi",
905
924
  "wasi 0.11.0+wasi-snapshot-preview1",
906
- "winapi",
925
+ "windows-sys",
907
926
  ]
908
927
 
909
928
  [[package]]
910
- name = "miow"
911
- version = "0.3.7"
929
+ name = "names"
930
+ version = "0.13.0"
912
931
  source = "registry+https://github.com/rust-lang/crates.io-index"
913
- checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
932
+ checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146"
914
933
  dependencies = [
915
- "winapi",
934
+ "clap 3.1.18",
935
+ "rand 0.8.5",
916
936
  ]
917
937
 
918
938
  [[package]]
@@ -974,15 +994,6 @@ dependencies = [
974
994
  "minimal-lexical",
975
995
  ]
976
996
 
977
- [[package]]
978
- name = "ntapi"
979
- version = "0.3.7"
980
- source = "registry+https://github.com/rust-lang/crates.io-index"
981
- checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
982
- dependencies = [
983
- "winapi",
984
- ]
985
-
986
997
  [[package]]
987
998
  name = "num-format"
988
999
  version = "0.4.0"
@@ -1005,9 +1016,9 @@ dependencies = [
1005
1016
 
1006
1017
  [[package]]
1007
1018
  name = "num-traits"
1008
- version = "0.2.14"
1019
+ version = "0.2.15"
1009
1020
  source = "registry+https://github.com/rust-lang/crates.io-index"
1010
- checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
1021
+ checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
1011
1022
  dependencies = [
1012
1023
  "autocfg",
1013
1024
  ]
@@ -1034,24 +1045,36 @@ dependencies = [
1034
1045
 
1035
1046
  [[package]]
1036
1047
  name = "once_cell"
1037
- version = "1.10.0"
1048
+ version = "1.12.0"
1038
1049
  source = "registry+https://github.com/rust-lang/crates.io-index"
1039
- checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
1050
+ checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
1040
1051
 
1041
1052
  [[package]]
1042
1053
  name = "openssl"
1043
- version = "0.10.38"
1054
+ version = "0.10.40"
1044
1055
  source = "registry+https://github.com/rust-lang/crates.io-index"
1045
- checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
1056
+ checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
1046
1057
  dependencies = [
1047
1058
  "bitflags",
1048
1059
  "cfg-if",
1049
1060
  "foreign-types",
1050
1061
  "libc",
1051
1062
  "once_cell",
1063
+ "openssl-macros",
1052
1064
  "openssl-sys",
1053
1065
  ]
1054
1066
 
1067
+ [[package]]
1068
+ name = "openssl-macros"
1069
+ version = "0.1.0"
1070
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1071
+ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
1072
+ dependencies = [
1073
+ "proc-macro2",
1074
+ "quote",
1075
+ "syn",
1076
+ ]
1077
+
1055
1078
  [[package]]
1056
1079
  name = "openssl-probe"
1057
1080
  version = "0.1.5"
@@ -1060,9 +1083,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
1060
1083
 
1061
1084
  [[package]]
1062
1085
  name = "openssl-sys"
1063
- version = "0.9.72"
1086
+ version = "0.9.74"
1064
1087
  source = "registry+https://github.com/rust-lang/crates.io-index"
1065
- checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
1088
+ checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1"
1066
1089
  dependencies = [
1067
1090
  "autocfg",
1068
1091
  "cc",
@@ -1073,9 +1096,22 @@ dependencies = [
1073
1096
 
1074
1097
  [[package]]
1075
1098
  name = "os_str_bytes"
1076
- version = "6.0.0"
1099
+ version = "6.1.0"
1077
1100
  source = "registry+https://github.com/rust-lang/crates.io-index"
1078
- checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
1101
+ checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
1102
+
1103
+ [[package]]
1104
+ name = "parking_lot_core"
1105
+ version = "0.9.3"
1106
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1107
+ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
1108
+ dependencies = [
1109
+ "cfg-if",
1110
+ "libc",
1111
+ "redox_syscall",
1112
+ "smallvec",
1113
+ "windows-sys",
1114
+ ]
1079
1115
 
1080
1116
  [[package]]
1081
1117
  name = "peeking_take_while"
@@ -1145,32 +1181,32 @@ dependencies = [
1145
1181
 
1146
1182
  [[package]]
1147
1183
  name = "proc-macro2"
1148
- version = "1.0.37"
1184
+ version = "1.0.39"
1149
1185
  source = "registry+https://github.com/rust-lang/crates.io-index"
1150
- checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
1186
+ checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
1151
1187
  dependencies = [
1152
- "unicode-xid",
1188
+ "unicode-ident",
1153
1189
  ]
1154
1190
 
1155
1191
  [[package]]
1156
1192
  name = "proc-maps"
1157
- version = "0.2.0"
1193
+ version = "0.2.1"
1158
1194
  source = "registry+https://github.com/rust-lang/crates.io-index"
1159
- checksum = "5d01e71493938bee4c460ec61aabbf0801e08cd2714d1677365b4d7f81475353"
1195
+ checksum = "a2f62c16ccc63ce2f590b17b8b9b33616f59631b8982ad52ed21e7f6d936c409"
1160
1196
  dependencies = [
1161
1197
  "anyhow",
1162
1198
  "bindgen",
1163
1199
  "libc",
1164
1200
  "libproc 0.10.0",
1165
- "mach",
1201
+ "mach2",
1166
1202
  "winapi",
1167
1203
  ]
1168
1204
 
1169
1205
  [[package]]
1170
1206
  name = "prost"
1171
- version = "0.10.1"
1207
+ version = "0.10.4"
1172
1208
  source = "registry+https://github.com/rust-lang/crates.io-index"
1173
- checksum = "a07b0857a71a8cb765763950499cae2413c3f9cede1133478c43600d9e146890"
1209
+ checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
1174
1210
  dependencies = [
1175
1211
  "bytes",
1176
1212
  "prost-derive",
@@ -1191,21 +1227,22 @@ dependencies = [
1191
1227
 
1192
1228
  [[package]]
1193
1229
  name = "pyroscope"
1194
- version = "0.5.1"
1230
+ version = "0.5.2"
1195
1231
  source = "registry+https://github.com/rust-lang/crates.io-index"
1196
- checksum = "d3152c7294efc50b6b3f1a734c6a0e4b05696c68931b6c3ce2bf3da72159acda"
1232
+ checksum = "fb63fa944e7139ecce68c6307e50b9f62780fc5b4de21ba2f04f32ec4f36499b"
1197
1233
  dependencies = [
1198
1234
  "libc",
1199
1235
  "log",
1236
+ "names",
1200
1237
  "reqwest",
1201
1238
  "thiserror",
1202
1239
  ]
1203
1240
 
1204
1241
  [[package]]
1205
1242
  name = "pyroscope_rbspy"
1206
- version = "0.2.0"
1243
+ version = "0.2.1"
1207
1244
  source = "registry+https://github.com/rust-lang/crates.io-index"
1208
- checksum = "b038acb1c386903c37c27b19584d2de04b9fc3e160fd628d351f2666a86ac993"
1245
+ checksum = "3359aa2a37be1fd6fa096cb1b73380c3f8b975346d5b3423f7a4f559acb9ba0a"
1209
1246
  dependencies = [
1210
1247
  "anyhow",
1211
1248
  "log",
@@ -1216,9 +1253,9 @@ dependencies = [
1216
1253
 
1217
1254
  [[package]]
1218
1255
  name = "quick-xml"
1219
- version = "0.22.0"
1256
+ version = "0.23.0"
1220
1257
  source = "registry+https://github.com/rust-lang/crates.io-index"
1221
- checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b"
1258
+ checksum = "9279fbdacaad3baf559d8cabe0acc3d06e30ea14931af31af79578ac0946decc"
1222
1259
  dependencies = [
1223
1260
  "memchr",
1224
1261
  ]
@@ -1296,7 +1333,6 @@ version = "0.1.0"
1296
1333
  dependencies = [
1297
1334
  "pyroscope",
1298
1335
  "pyroscope_rbspy",
1299
- "rutie",
1300
1336
  ]
1301
1337
 
1302
1338
  [[package]]
@@ -1307,7 +1343,7 @@ checksum = "bcbebdf0037de5a92722b0bca2965ce0a76cd5c962225cf355e31ac668ea653f"
1307
1343
  dependencies = [
1308
1344
  "anyhow",
1309
1345
  "chrono",
1310
- "clap 3.1.14",
1346
+ "clap 3.1.18",
1311
1347
  "ctrlc",
1312
1348
  "directories",
1313
1349
  "elf",
@@ -1350,8 +1386,7 @@ dependencies = [
1350
1386
  [[package]]
1351
1387
  name = "read-process-memory"
1352
1388
  version = "0.1.4"
1353
- source = "registry+https://github.com/rust-lang/crates.io-index"
1354
- checksum = "a103589f0c267c68328595f1ff45647e9d4b3ee6b9c1c51dcdc9b4b55ca504c5"
1389
+ source = "git+https://github.com/omarabid/read-process-memory.git?branch=0.1.4-fix#51a5122d0d084478cc7563414255392e8f026971"
1355
1390
  dependencies = [
1356
1391
  "libc",
1357
1392
  "log",
@@ -1381,9 +1416,9 @@ dependencies = [
1381
1416
 
1382
1417
  [[package]]
1383
1418
  name = "regex"
1384
- version = "1.5.5"
1419
+ version = "1.5.6"
1385
1420
  source = "registry+https://github.com/rust-lang/crates.io-index"
1386
- checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
1421
+ checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
1387
1422
  dependencies = [
1388
1423
  "aho-corasick",
1389
1424
  "memchr",
@@ -1392,9 +1427,9 @@ dependencies = [
1392
1427
 
1393
1428
  [[package]]
1394
1429
  name = "regex-syntax"
1395
- version = "0.6.25"
1430
+ version = "0.6.26"
1396
1431
  source = "registry+https://github.com/rust-lang/crates.io-index"
1397
- checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
1432
+ checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
1398
1433
 
1399
1434
  [[package]]
1400
1435
  name = "remoteprocess"
@@ -1443,6 +1478,7 @@ dependencies = [
1443
1478
  "http",
1444
1479
  "http-body",
1445
1480
  "hyper",
1481
+ "hyper-rustls",
1446
1482
  "hyper-tls",
1447
1483
  "ipnet",
1448
1484
  "js-sys",
@@ -1452,11 +1488,15 @@ dependencies = [
1452
1488
  "native-tls",
1453
1489
  "percent-encoding",
1454
1490
  "pin-project-lite",
1491
+ "rustls",
1492
+ "rustls-native-certs",
1493
+ "rustls-pemfile 0.3.0",
1455
1494
  "serde",
1456
1495
  "serde_json",
1457
1496
  "serde_urlencoded",
1458
1497
  "tokio",
1459
1498
  "tokio-native-tls",
1499
+ "tokio-rustls",
1460
1500
  "url",
1461
1501
  "wasm-bindgen",
1462
1502
  "wasm-bindgen-futures",
@@ -1473,6 +1513,21 @@ dependencies = [
1473
1513
  "bytemuck",
1474
1514
  ]
1475
1515
 
1516
+ [[package]]
1517
+ name = "ring"
1518
+ version = "0.16.20"
1519
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1520
+ checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
1521
+ dependencies = [
1522
+ "cc",
1523
+ "libc",
1524
+ "once_cell",
1525
+ "spin",
1526
+ "untrusted",
1527
+ "web-sys",
1528
+ "winapi",
1529
+ ]
1530
+
1476
1531
  [[package]]
1477
1532
  name = "rustc-demangle"
1478
1533
  version = "0.1.21"
@@ -1486,29 +1541,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1486
1541
  checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
1487
1542
 
1488
1543
  [[package]]
1489
- name = "rutie"
1490
- version = "0.8.4"
1544
+ name = "rustls"
1545
+ version = "0.20.6"
1491
1546
  source = "registry+https://github.com/rust-lang/crates.io-index"
1492
- checksum = "5d97db4cbb9739b48364c38cc9a6ebabdc07b42bd87b60ab448e1f29eaebb2ac"
1547
+ checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
1493
1548
  dependencies = [
1494
- "lazy_static",
1495
- "libc",
1549
+ "log",
1550
+ "ring",
1551
+ "sct",
1552
+ "webpki",
1553
+ ]
1554
+
1555
+ [[package]]
1556
+ name = "rustls-native-certs"
1557
+ version = "0.6.2"
1558
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1559
+ checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
1560
+ dependencies = [
1561
+ "openssl-probe",
1562
+ "rustls-pemfile 1.0.0",
1563
+ "schannel",
1564
+ "security-framework",
1565
+ ]
1566
+
1567
+ [[package]]
1568
+ name = "rustls-pemfile"
1569
+ version = "0.3.0"
1570
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1571
+ checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360"
1572
+ dependencies = [
1573
+ "base64",
1574
+ ]
1575
+
1576
+ [[package]]
1577
+ name = "rustls-pemfile"
1578
+ version = "1.0.0"
1579
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1580
+ checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
1581
+ dependencies = [
1582
+ "base64",
1496
1583
  ]
1497
1584
 
1498
1585
  [[package]]
1499
1586
  name = "ryu"
1500
- version = "1.0.9"
1587
+ version = "1.0.10"
1501
1588
  source = "registry+https://github.com/rust-lang/crates.io-index"
1502
- checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
1589
+ checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
1503
1590
 
1504
1591
  [[package]]
1505
1592
  name = "schannel"
1506
- version = "0.1.19"
1593
+ version = "0.1.20"
1507
1594
  source = "registry+https://github.com/rust-lang/crates.io-index"
1508
- checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
1595
+ checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
1509
1596
  dependencies = [
1510
1597
  "lazy_static",
1511
- "winapi",
1598
+ "windows-sys",
1512
1599
  ]
1513
1600
 
1514
1601
  [[package]]
@@ -1537,6 +1624,16 @@ dependencies = [
1537
1624
  "syn",
1538
1625
  ]
1539
1626
 
1627
+ [[package]]
1628
+ name = "sct"
1629
+ version = "0.7.0"
1630
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1631
+ checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
1632
+ dependencies = [
1633
+ "ring",
1634
+ "untrusted",
1635
+ ]
1636
+
1540
1637
  [[package]]
1541
1638
  name = "security-framework"
1542
1639
  version = "2.6.1"
@@ -1579,11 +1676,11 @@ dependencies = [
1579
1676
 
1580
1677
  [[package]]
1581
1678
  name = "serde_json"
1582
- version = "1.0.80"
1679
+ version = "1.0.81"
1583
1680
  source = "registry+https://github.com/rust-lang/crates.io-index"
1584
- checksum = "f972498cf015f7c0746cac89ebe1d6ef10c293b94175a243a2d9442c163d9944"
1681
+ checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
1585
1682
  dependencies = [
1586
- "itoa 1.0.1",
1683
+ "itoa 1.0.2",
1587
1684
  "ryu",
1588
1685
  "serde",
1589
1686
  ]
@@ -1595,7 +1692,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1595
1692
  checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
1596
1693
  dependencies = [
1597
1694
  "form_urlencoded",
1598
- "itoa 1.0.1",
1695
+ "itoa 1.0.2",
1599
1696
  "ryu",
1600
1697
  "serde",
1601
1698
  ]
@@ -1628,6 +1725,12 @@ dependencies = [
1628
1725
  "winapi",
1629
1726
  ]
1630
1727
 
1728
+ [[package]]
1729
+ name = "spin"
1730
+ version = "0.5.2"
1731
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1732
+ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
1733
+
1631
1734
  [[package]]
1632
1735
  name = "stable_deref_trait"
1633
1736
  version = "1.2.0"
@@ -1654,13 +1757,13 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
1654
1757
 
1655
1758
  [[package]]
1656
1759
  name = "syn"
1657
- version = "1.0.92"
1760
+ version = "1.0.96"
1658
1761
  source = "registry+https://github.com/rust-lang/crates.io-index"
1659
- checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52"
1762
+ checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
1660
1763
  dependencies = [
1661
1764
  "proc-macro2",
1662
1765
  "quote",
1663
- "unicode-xid",
1766
+ "unicode-ident",
1664
1767
  ]
1665
1768
 
1666
1769
  [[package]]
@@ -1769,9 +1872,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
1769
1872
 
1770
1873
  [[package]]
1771
1874
  name = "tokio"
1772
- version = "1.18.0"
1875
+ version = "1.19.2"
1773
1876
  source = "registry+https://github.com/rust-lang/crates.io-index"
1774
- checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b"
1877
+ checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
1775
1878
  dependencies = [
1776
1879
  "bytes",
1777
1880
  "libc",
@@ -1794,11 +1897,22 @@ dependencies = [
1794
1897
  "tokio",
1795
1898
  ]
1796
1899
 
1900
+ [[package]]
1901
+ name = "tokio-rustls"
1902
+ version = "0.23.4"
1903
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1904
+ checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
1905
+ dependencies = [
1906
+ "rustls",
1907
+ "tokio",
1908
+ "webpki",
1909
+ ]
1910
+
1797
1911
  [[package]]
1798
1912
  name = "tokio-util"
1799
- version = "0.7.1"
1913
+ version = "0.7.3"
1800
1914
  source = "registry+https://github.com/rust-lang/crates.io-index"
1801
- checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
1915
+ checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
1802
1916
  dependencies = [
1803
1917
  "bytes",
1804
1918
  "futures-core",
@@ -1816,34 +1930,22 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
1816
1930
 
1817
1931
  [[package]]
1818
1932
  name = "tracing"
1819
- version = "0.1.34"
1933
+ version = "0.1.35"
1820
1934
  source = "registry+https://github.com/rust-lang/crates.io-index"
1821
- checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
1935
+ checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
1822
1936
  dependencies = [
1823
1937
  "cfg-if",
1824
1938
  "pin-project-lite",
1825
- "tracing-attributes",
1826
1939
  "tracing-core",
1827
1940
  ]
1828
1941
 
1829
- [[package]]
1830
- name = "tracing-attributes"
1831
- version = "0.1.21"
1832
- source = "registry+https://github.com/rust-lang/crates.io-index"
1833
- checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
1834
- dependencies = [
1835
- "proc-macro2",
1836
- "quote",
1837
- "syn",
1838
- ]
1839
-
1840
1942
  [[package]]
1841
1943
  name = "tracing-core"
1842
- version = "0.1.26"
1944
+ version = "0.1.27"
1843
1945
  source = "registry+https://github.com/rust-lang/crates.io-index"
1844
- checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
1946
+ checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921"
1845
1947
  dependencies = [
1846
- "lazy_static",
1948
+ "once_cell",
1847
1949
  ]
1848
1950
 
1849
1951
  [[package]]
@@ -1858,6 +1960,12 @@ version = "0.3.8"
1858
1960
  source = "registry+https://github.com/rust-lang/crates.io-index"
1859
1961
  checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
1860
1962
 
1963
+ [[package]]
1964
+ name = "unicode-ident"
1965
+ version = "1.0.0"
1966
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1967
+ checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
1968
+
1861
1969
  [[package]]
1862
1970
  name = "unicode-normalization"
1863
1971
  version = "0.1.19"
@@ -1874,10 +1982,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1874
1982
  checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
1875
1983
 
1876
1984
  [[package]]
1877
- name = "unicode-xid"
1878
- version = "0.2.2"
1985
+ name = "untrusted"
1986
+ version = "0.7.1"
1879
1987
  source = "registry+https://github.com/rust-lang/crates.io-index"
1880
- checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
1988
+ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
1881
1989
 
1882
1990
  [[package]]
1883
1991
  name = "url"
@@ -2007,6 +2115,16 @@ dependencies = [
2007
2115
  "wasm-bindgen",
2008
2116
  ]
2009
2117
 
2118
+ [[package]]
2119
+ name = "webpki"
2120
+ version = "0.22.0"
2121
+ source = "registry+https://github.com/rust-lang/crates.io-index"
2122
+ checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
2123
+ dependencies = [
2124
+ "ring",
2125
+ "untrusted",
2126
+ ]
2127
+
2010
2128
  [[package]]
2011
2129
  name = "which"
2012
2130
  version = "4.2.5"
@@ -2049,6 +2167,49 @@ version = "0.4.0"
2049
2167
  source = "registry+https://github.com/rust-lang/crates.io-index"
2050
2168
  checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
2051
2169
 
2170
+ [[package]]
2171
+ name = "windows-sys"
2172
+ version = "0.36.1"
2173
+ source = "registry+https://github.com/rust-lang/crates.io-index"
2174
+ checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
2175
+ dependencies = [
2176
+ "windows_aarch64_msvc",
2177
+ "windows_i686_gnu",
2178
+ "windows_i686_msvc",
2179
+ "windows_x86_64_gnu",
2180
+ "windows_x86_64_msvc",
2181
+ ]
2182
+
2183
+ [[package]]
2184
+ name = "windows_aarch64_msvc"
2185
+ version = "0.36.1"
2186
+ source = "registry+https://github.com/rust-lang/crates.io-index"
2187
+ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
2188
+
2189
+ [[package]]
2190
+ name = "windows_i686_gnu"
2191
+ version = "0.36.1"
2192
+ source = "registry+https://github.com/rust-lang/crates.io-index"
2193
+ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
2194
+
2195
+ [[package]]
2196
+ name = "windows_i686_msvc"
2197
+ version = "0.36.1"
2198
+ source = "registry+https://github.com/rust-lang/crates.io-index"
2199
+ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
2200
+
2201
+ [[package]]
2202
+ name = "windows_x86_64_gnu"
2203
+ version = "0.36.1"
2204
+ source = "registry+https://github.com/rust-lang/crates.io-index"
2205
+ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
2206
+
2207
+ [[package]]
2208
+ name = "windows_x86_64_msvc"
2209
+ version = "0.36.1"
2210
+ source = "registry+https://github.com/rust-lang/crates.io-index"
2211
+ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
2212
+
2052
2213
  [[package]]
2053
2214
  name = "winreg"
2054
2215
  version = "0.10.1"
data/ext/rbspy/Cargo.toml CHANGED
@@ -8,6 +8,8 @@ name = "rbspy"
8
8
  crate-type = ["cdylib"]
9
9
 
10
10
  [dependencies]
11
- rutie = "0.8.3"
12
- pyroscope = {version = "0.5" }
11
+ pyroscope = {version = "0.5.2" }
13
12
  pyroscope_rbspy = { version = "0.2" }
13
+
14
+ [patch.crates-io]
15
+ read-process-memory = {git = "https://github.com/omarabid/read-process-memory.git", branch = "0.1.4-fix"}
data/ext/rbspy/Rakefile CHANGED
@@ -20,6 +20,10 @@ class RbspyRakeCargoHelper
20
20
  end
21
21
 
22
22
  def self.rust_toolchain
23
+ # return env variable if set
24
+ target = ENV["RUST_TARGET"]
25
+ return target if target
26
+
23
27
  str = `rustc --version --verbose`
24
28
  info = str.lines.map {|l| l.chomp.split(/:\s+/, 2)}.drop(1).to_h
25
29
  info["host"]
@@ -45,7 +49,8 @@ class RbspyRakeCargoHelper
45
49
  *cc_flags.flat_map {|a| ["-C", "link-arg=#{a}"] },
46
50
  "-L", "native=#{RbConfig::CONFIG["libdir"]}",
47
51
  *dld_flags,
48
- *platform_flags]
52
+ *platform_flags,
53
+ ]
49
54
  end
50
55
 
51
56
  def self.dld_flags
@@ -116,7 +121,8 @@ desc "build gem native extension and copy to lib"
116
121
  task rbspy_install: [:rbspy_cd, :rbspy_build] do
117
122
  helper = RbspyRakeCargoHelper.new
118
123
  profile_dir = @dev ? "debug" : "release"
119
- source = File.join(RbspyRakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
124
+ arch_dir = RbspyRakeCargoHelper.rust_toolchain
125
+ source = File.join(RbspyRakeCargoHelper.cargo_target_dir, arch_dir, profile_dir, helper.rust_name)
120
126
  dest = File.join(helper.install_dir, helper.ruby_name)
121
127
  mkdir_p(helper.install_dir)
122
128
  rm(dest) if File.exist?(dest)
@@ -125,7 +131,7 @@ end
125
131
 
126
132
  desc "build gem native extension"
127
133
  task rbspy_build: [:rbspy_cargo, :rbspy_cd] do
128
- sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *RbspyRakeCargoHelper.flags
134
+ sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--target=#{RbspyRakeCargoHelper.rust_toolchain}", "--", *RbspyRakeCargoHelper.flags
129
135
  end
130
136
 
131
137
  desc "clean up release build artifacts"
data/ext/rbspy/extconf.rb CHANGED
@@ -1,12 +1,11 @@
1
1
  require 'mkmf'
2
- require 'rb_sys/mkmf'
3
2
  require 'rake'
4
3
 
5
- create_rust_makefile('rbspy')
4
+ create_makefile('rbspy')
6
5
 
7
6
  app = Rake.application
8
7
  app.init
9
8
  app.add_import 'Rakefile'
10
9
  app.load_rakefile
11
10
 
12
- app['rbspy'].invoke
11
+ app['default'].invoke
data/ext/rbspy/src/lib.rs CHANGED
@@ -94,7 +94,6 @@ pub extern "C" fn initialize_agent(
94
94
  true
95
95
  }
96
96
 
97
- #[link(name = "pyroscope_ffi", vers = "0.1")]
98
97
  #[no_mangle]
99
98
  pub extern "C" fn drop_agent() -> bool {
100
99
  let s = signalpass();
@@ -102,7 +101,6 @@ pub extern "C" fn drop_agent() -> bool {
102
101
  true
103
102
  }
104
103
 
105
- #[link(name = "pyroscope_ffi", vers = "0.1")]
106
104
  #[no_mangle]
107
105
  pub extern "C" fn add_tag(thread_id: u64, key: *const c_char, value: *const c_char) -> bool {
108
106
  let s = signalpass();
@@ -119,7 +117,6 @@ pub extern "C" fn add_tag(thread_id: u64, key: *const c_char, value: *const c_ch
119
117
  true
120
118
  }
121
119
 
122
- #[link(name = "pyroscope_ffi", vers = "0.1")]
123
120
  #[no_mangle]
124
121
  pub extern "C" fn remove_tag(thread_id: u64, key: *const c_char, value: *const c_char) -> bool {
125
122
  let s = signalpass();
@@ -4,9 +4,9 @@ version = 3
4
4
 
5
5
  [[package]]
6
6
  name = "libc"
7
- version = "0.2.125"
7
+ version = "0.2.126"
8
8
  source = "registry+https://github.com/rust-lang/crates.io-index"
9
- checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
9
+ checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
10
10
 
11
11
  [[package]]
12
12
  name = "thread_id"
@@ -20,6 +20,10 @@ class ThreadIdRakeCargoHelper
20
20
  end
21
21
 
22
22
  def self.rust_toolchain
23
+ # return env variable if set
24
+ target = ENV["RUST_TARGET"]
25
+ return target if target
26
+
23
27
  str = `rustc --version --verbose`
24
28
  info = str.lines.map {|l| l.chomp.split(/:\s+/, 2)}.drop(1).to_h
25
29
  info["host"]
@@ -116,7 +120,8 @@ desc "build gem native extension and copy to lib"
116
120
  task thread_id_install: [:thread_id_cd, :thread_id_build] do
117
121
  helper = ThreadIdRakeCargoHelper.new
118
122
  profile_dir = @dev ? "debug" : "release"
119
- source = File.join(ThreadIdRakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
123
+ arch_dir = RbspyRakeCargoHelper.rust_toolchain
124
+ source = File.join(ThreadIdRakeCargoHelper.cargo_target_dir, arch_dir, profile_dir, helper.rust_name)
120
125
  dest = File.join(helper.install_dir, helper.ruby_name)
121
126
  mkdir_p(helper.install_dir)
122
127
  rm(dest) if File.exist?(dest)
@@ -125,7 +130,7 @@ end
125
130
 
126
131
  desc "build gem native extension"
127
132
  task thread_id_build: [:thread_id_cargo, :thread_id_cd] do
128
- sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *ThreadIdRakeCargoHelper.flags
133
+ sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--target=#{RbspyRakeCargoHelper.rust_toolchain}", "--", *RbspyRakeCargoHelper.flags
129
134
  end
130
135
 
131
136
  desc "clean up release build artifacts"
@@ -8,4 +8,4 @@ app.init
8
8
  app.add_import 'Rakefile'
9
9
  app.load_rakefile
10
10
 
11
- app['thread_id'].invoke
11
+ app['default'].invoke
@@ -1,3 +1,3 @@
1
1
  module Pyroscope
2
- VERSION = '0.1.4'.freeze
2
+ VERSION = '0.1.9'.freeze
3
3
  end
@@ -1,12 +1,12 @@
1
1
  require 'ffi'
2
2
  require 'fiddle'
3
3
 
4
- $libm = Fiddle.dlopen(File.expand_path(File.dirname(__FILE__)) + '/thread_id/thread_id.so')
4
+ $libm = Fiddle.dlopen(File.expand_path(File.dirname(__FILE__)) + "/thread_id/thread_id.#{RbConfig::CONFIG["DLEXT"]}")
5
5
 
6
6
 
7
7
  module Rust
8
8
  extend FFI::Library
9
- ffi_lib File.expand_path(File.dirname(__FILE__)) + '/rbspy/rbspy.' + FFI::Platform::LIBSUFFIX
9
+ ffi_lib File.expand_path(File.dirname(__FILE__)) + "/rbspy/rbspy.#{RbConfig::CONFIG["DLEXT"]}"
10
10
  attach_function :initialize_agent, [:string, :string, :int, :bool, :string], :bool
11
11
  attach_function :add_tag, [:uint64, :string, :string], :bool
12
12
  attach_function :remove_tag, [:uint64, :string, :string], :bool
@@ -66,7 +66,7 @@ end
66
66
 
67
67
  # get thread id
68
68
  def thread_id
69
- thread_id = Fiddle::Function.new($libm['thread_id'], [], Fiddle::TYPE_INT64_T)
69
+ thread_id = Fiddle::Function.new($libm['thread_id'], [], Fiddle::TYPE_LONG_LONG)
70
70
  thread_id.call
71
71
  end
72
72
 
Binary file
Binary file
data/pyroscope.gemspec ADDED
@@ -0,0 +1,33 @@
1
+ require_relative "lib/pyroscope/version"
2
+
3
+ Gem::Specification.new do |s|
4
+ s.name = 'pyroscope_beta'
5
+ s.version = Pyroscope::VERSION
6
+ s.summary = 'Pyroscope Beta'
7
+ s.description = 'Pyroscope FFI Integration for Ruby'
8
+ s.authors = ['Pyroscope Team']
9
+ s.email = ['contact@pyroscope.io']
10
+ s.homepage = 'https://pyroscope.io'
11
+ s.license = 'Apache-2.0'
12
+
13
+ # Specify which files should be added to the gem when it is released.
14
+ # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
15
+ #s.files = Dir.chdir(__dir__) do
16
+ #`git ls-files -z`.split("\x0").reject do |f|
17
+ #(f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
18
+ #end
19
+ #end
20
+ s.files = `git ls-files -z`.split("\0").reject { |f| f =~ /^(\.|G|spec|Rakefile)/ }
21
+
22
+ s.platform = Gem::Platform::RUBY
23
+
24
+ s.required_ruby_version = ">= 2.5.9"
25
+
26
+ s.extensions = ['ext/rbspy/extconf.rb', 'ext/thread_id/extconf.rb']
27
+
28
+ s.add_dependency 'ffi'
29
+ s.add_dependency 'fiddle'
30
+
31
+ s.add_development_dependency 'bundler'
32
+ s.add_development_dependency 'rake', '~> 13.0'
33
+ end
metadata CHANGED
@@ -1,71 +1,80 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pyroscope_beta
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.9
5
5
  platform: x86_64-linux
6
6
  authors:
7
7
  - Pyroscope Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-05-17 00:00:00.000000000 Z
11
+ date: 2022-06-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ffi
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '1.9'
19
+ version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: '1.9'
26
+ version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: fiddle
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '1.1'
33
+ version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '1.1'
40
+ version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
- name: rake
42
+ name: bundler
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '10.0'
48
- type: :runtime
47
+ version: '0'
48
+ type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '10.0'
54
+ version: '0'
55
+ - !ruby/object:Gem::Dependency
56
+ name: rake
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: '13.0'
62
+ type: :development
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
68
+ version: '13.0'
55
69
  description: Pyroscope FFI Integration for Ruby
56
70
  email:
57
71
  - contact@pyroscope.io
58
72
  executables: []
59
- extensions:
60
- - ext/rbspy/extconf.rb
61
- - ext/thread_id/extconf.rb
73
+ extensions: []
62
74
  extra_rdoc_files: []
63
75
  files:
64
- - Gemfile
65
- - Gemfile.lock
66
76
  - LICENSE
67
77
  - README.md
68
- - Rakefile
69
78
  - ext/rbspy/Cargo.lock
70
79
  - ext/rbspy/Cargo.toml
71
80
  - ext/rbspy/Rakefile
@@ -78,6 +87,9 @@ files:
78
87
  - ext/thread_id/src/lib.rs
79
88
  - lib/pyroscope/version.rb
80
89
  - lib/pyroscope_beta.rb
90
+ - lib/rbspy/rbspy.so
91
+ - lib/thread_id/thread_id.so
92
+ - pyroscope.gemspec
81
93
  homepage: https://pyroscope.io
82
94
  licenses:
83
95
  - Apache-2.0
@@ -90,14 +102,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
90
102
  requirements:
91
103
  - - ">="
92
104
  - !ruby/object:Gem::Version
93
- version: '0'
105
+ version: 2.5.9
94
106
  required_rubygems_version: !ruby/object:Gem::Requirement
95
107
  requirements:
96
108
  - - ">="
97
109
  - !ruby/object:Gem::Version
98
110
  version: '0'
99
111
  requirements: []
100
- rubygems_version: 3.3.8
112
+ rubygems_version: 3.4.0.dev
101
113
  signing_key:
102
114
  specification_version: 4
103
115
  summary: Pyroscope Beta
data/Gemfile DELETED
@@ -1,4 +0,0 @@
1
- source 'https://rubygems.org'
2
-
3
- gem 'ffi'
4
- gem 'fiddle'
data/Gemfile.lock DELETED
@@ -1,15 +0,0 @@
1
- GEM
2
- remote: https://rubygems.org/
3
- specs:
4
- ffi (1.15.5)
5
- fiddle (1.1.0)
6
-
7
- PLATFORMS
8
- x86_64-linux
9
-
10
- DEPENDENCIES
11
- ffi
12
- fiddle
13
-
14
- BUNDLED WITH
15
- 2.3.12
data/Rakefile DELETED
@@ -1,15 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'rake/extensiontask'
4
-
5
- load File.expand_path('./ext/thread_id/Rakefile', __dir__)
6
- load File.expand_path('./ext/rbspy/Rakefile', __dir__)
7
-
8
- task default: %w[hello]
9
-
10
- task :hello do
11
- puts 'Hello!'
12
- end
13
-
14
- Rake::ExtensionTask.new('thread_id')
15
- Rake::ExtensionTask.new('rbspy')