test

src/AppModels/MinerStudio/Vms/MinerClientsWindowViewModel.cs

@@ -584,7 +584,7 @@ namespace NTMiner.MinerStudio.Vms {
                             VirtualRoot.Out.ShowError("数值格式错误，必须是数值（可带小数）");
                         }
                         else {
-                            int virtualMemoryMb = Convert.ToInt32(virtualMemoryGb * 1024);
+                            int virtualMemoryMb = Convert.ToInt32(virtualMemoryGb * NTKeyword.IntK);
                             Dictionary<string, int> data = new Dictionary<string, int> {
                                 {"Auto", virtualMemoryMb }
                             };

src/AppModels/Vms/DriveViewModel.cs

@@ -19,7 +19,7 @@ namespace NTMiner.Vms {
                     VirtualMemoryMaxSizeMb = 0;
                 }
                 else {
-                    VirtualMemoryMaxSizeMb = (int)(Math.Pow(2.0, i) * 1024);
+                    VirtualMemoryMaxSizeMb = (int)(Math.Pow(2.0, i) * NTKeyword.IntK);
                 }
             });
         }
@@ -98,7 +98,7 @@ namespace NTMiner.Vms {
                     this.VirtualMemoryMaxSizeMb = 0;
                 }
                 else {
-                    this.VirtualMemoryMaxSizeMb = (int)(Math.Pow(2, value) * 1024);
+                    this.VirtualMemoryMaxSizeMb = (int)(Math.Pow(2, value) * NTKeyword.IntK);
                 }
                 OnPropertyChanged(nameof(VirtualMemoryMaxSizeLog2));
             }

src/NTMinerClient/Mine/MineContext.cs

@@ -394,7 +394,7 @@ namespace NTMiner.Mine {
                 Task.Factory.StartNew(() => {
                     using (FileStream fs = new FileStream(this.LogFileFullName, FileMode.OpenOrCreate, FileAccess.ReadWrite)) {
                         const byte r = (byte)'\r';
-                        byte[] buffer = new byte[1024];
+                        byte[] buffer = new byte[NTKeyword.IntK];
                         int ret;
                         // Read会阻塞，直到读取到字符或者hWriteOut被关闭
                         while ((ret = Read(buffer, 0, buffer.Length, _hReadOut)) > 0) {

src/NTMinerClient/NTMinerContext.partials.GetServerJson.cs

@@ -19,7 +19,7 @@ namespace NTMiner {
                     webRequest.Headers.Add("Accept-Encoding", "gzip, deflate, br");
                     var response = webRequest.GetResponse();
                     using (Stream ms = new MemoryStream(), stream = response.GetResponseStream()) {
-                        byte[] buffer = new byte[1024];
+                        byte[] buffer = new byte[NTKeyword.IntK];
                         int n = stream.Read(buffer, 0, buffer.Length);
                         while (n > 0) {
                             ms.Write(buffer, 0, n);
@@ -44,7 +44,7 @@ namespace NTMiner {
             using (Stream ms = new MemoryStream(zippedData), 
                           compressedzipStream = new GZipStream(ms, CompressionMode.Decompress), 
                           outBuffer = new MemoryStream()) {
-                byte[] block = new byte[1024];
+                byte[] block = new byte[NTKeyword.IntK];
                 while (true) {
                     int bytesRead = compressedzipStream.Read(block, 0, block.Length);
                     if (bytesRead <= 0) {

src/NTMinerClient/Report/ReportDataProvider.cs

@@ -94,7 +94,7 @@ namespace NTMiner.Report {
                 GpuDriver = root.GpuSet.DriverVersion.ToString(),
                 GpuType = root.GpuSet.GpuType,
                 OSVirtualMemoryMb = VirtualRoot.DriveSet.OSVirtualMemoryMb,
-                TotalPhysicalMemoryMb = (int)(Windows.Ram.Instance.TotalPhysicalMemory / (1024 * 1024)),
+                TotalPhysicalMemoryMb = (int)(Windows.Ram.Instance.TotalPhysicalMemory / NTKeyword.IntM),
                 KernelCommandLine = string.Empty,
                 DiskSpace = VirtualRoot.DriveSet.ToDiskSpaceString(),
                 IsAutoRestartKernel = workProfile.IsAutoRestartKernel,

src/NTMinerClient/ZipUtil.cs

@@ -43,7 +43,7 @@ namespace NTMiner {
                         // 放进try catch保证一个文件的失败不影响另一个
                         try {
                             using (FileStream streamWriter = File.Create(path)) {
-                                const int bufferSize = 1024 * 30;
+                                const int bufferSize = NTKeyword.IntK * 30;
                                 byte[] data = new byte[bufferSize];
                                 StreamUtils.Copy(zipInputStream, streamWriter, data);
                             }

src/NTMinerDataSchemas/NTKeyword.cs

@@ -1,7 +1,9 @@
 namespace NTMiner {
     public static class NTKeyword {
         public const double DoubleK = 1024;
+        public const int IntK = 1024;
         public const double DoubleM = 1024 * 1024;
+        public const int IntM = 1024 * 1024;
         public const double DoubleG = 1024 * 1024 * 1024;
         public const ulong ULongG = 1024 * 1024 * 1024;
         public const long LongG = 1024 * 1024 * 1024;

src/NTMinerDataSchemas/Report/SpeedDto.cs

@@ -47,8 +47,8 @@ namespace NTMiner.Report {
         public int TotalPhysicalMemoryMb {
             get {
                 // 因为有客户端版本的单位不正确传上来的是kb不是Mb所以如果值较大除以1024
-                if (_totalPhysicalMemoryMb >= 100 * 1024) {
-                    _totalPhysicalMemoryMb /= 1024;
+                if (_totalPhysicalMemoryMb >= 100 * NTKeyword.IntK) {
+                    _totalPhysicalMemoryMb /= NTKeyword.IntK;
                 }
                 return _totalPhysicalMemoryMb;
             }

src/NTMinerWpf/Converters/ByteToMbConverter.cs

@@ -7,8 +7,7 @@ namespace NTMiner.Converters {
     public class ByteToMbConverter : IValueConverter {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
             double d = System.Convert.ToDouble(value);
-            const long g = 1024 * 1024;
-            return (d / g).ToString() + " MB";
+            return (d / NTKeyword.IntM).ToString() + " MB";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {

src/NTMinerWpf/Converters/MbToGbConverter.cs

@@ -7,7 +7,7 @@ namespace NTMiner.Converters {
     public class MbToGbConverter : IValueConverter {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
             double d = System.Convert.ToDouble(value);
-            return (d / 1024).ToString("f1") + " GB";
+            return (d / NTKeyword.IntK).ToString("f1") + " GB";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {

src/NTMinerlib/GZipUtil.cs

@@ -28,7 +28,7 @@ namespace NTMiner {
             using (MemoryStream inputStream = new MemoryStream(zippedData))
             using (GZipStream gZipStream = new GZipStream(inputStream, CompressionMode.Decompress))
             using (MemoryStream outputStream = new MemoryStream()) {
-                byte[] block = new byte[1024];
+                byte[] block = new byte[NTKeyword.IntK];
                 while (true) {
                     int bytesRead = gZipStream.Read(block, 0, block.Length);
                     if (bytesRead <= 0) {

src/NTMinerlib/Serialization/BinarySerializer.cs

@@ -15,7 +15,7 @@ namespace NTMiner.Serialization {
                 return new byte[0];
             }
             byte[] data = Encoding.UTF8.GetBytes(_jsonSerializer.Serialize(obj));
-            if (data.Length > 1024) {// 因为设计了_heade，这个值是可以改的
+            if (data.Length > NTKeyword.IntK) {// 因为设计了_heade，这个值是可以改的
                 data = GZipUtil.Compress(data);
                 byte[] array = new byte[_head.Length + data.Length];
                 _head.CopyTo(array, 0);

src/NTMinerlib/VirtualRoot.partials.DriveSet.cs

@@ -91,11 +91,11 @@ namespace NTMiner {
                     return;
                 }
                 if (virtualMemories.TryGetValue("Auto", out int virtualMemoryMb)) {
-                    long virtualMemoryB = virtualMemoryMb * 1024 * 1024;
+                    long virtualMemoryB = virtualMemoryMb * NTKeyword.IntM;
                     // 系统盘留出1Gb
                     long systemReserveB = NTKeyword.LongG;
                     // 非系统盘留出100Mb
-                    long reserveB = 100 * 1024 * 1024;
+                    long reserveB = 100 * NTKeyword.IntM;
                     if (_drives.Sum(a => a.AvailableFreeSpace) - systemReserveB - (_drives.Count - 1) * reserveB < virtualMemoryMb) {
                         return;
                     }
@@ -113,14 +113,14 @@ namespace NTMiner {
                     }
                     else {
                         // 设置在系统盘mb
-                        int mb = Convert.ToInt32((systemDrive.AvailableFreeSpace - systemReserveB) / (1024 * 1024));
+                        int mb = Convert.ToInt32((systemDrive.AvailableFreeSpace - systemReserveB) / NTKeyword.IntM);
                         list.Add(VirtualMemoryFormatString(systemDrive.Name, mb));
                         setedMb += mb;
                         var bigDrive = _drives.Where(a => !a.IsSystemDisk).OrderByDescending(a => a.AvailableFreeSpace).FirstOrDefault();
                         // 还需设置mb
                         mb = virtualMemoryMb - setedMb;
                         // 如果最大的盘可以装下剩余的虚拟内存就把剩余的都设置在这个盘
-                        if (bigDrive != null && bigDrive.AvailableFreeSpace - reserveB > mb * 1024 * 1024) {
+                        if (bigDrive != null && bigDrive.AvailableFreeSpace - reserveB > mb * NTKeyword.IntM) {
                             list.Add(VirtualMemoryFormatString(bigDrive.Name, mb));
                             setedMb += mb;
                         }
@@ -129,7 +129,7 @@ namespace NTMiner {
                                 if (drive.IsSystemDisk) {
                                     continue;
                                 }
-                                mb = Convert.ToInt32((drive.AvailableFreeSpace - reserveB) / (1024 * 1024));
+                                mb = Convert.ToInt32((drive.AvailableFreeSpace - reserveB) / NTKeyword.IntM);
                                 if (mb <= 0) {
                                     continue;
                                 }

src/UnitTests/RamTests.cs

@@ -8,7 +8,7 @@ namespace NTMiner {
         public void RamTest() {
             Windows.Ram ram = Windows.Ram.Instance;
             Console.WriteLine(ram.TotalPhysicalMemory);
-            Console.WriteLine(ram.TotalPhysicalMemory / (1024 * 1024) + "Mb");
+            Console.WriteLine(ram.TotalPhysicalMemory / NTKeyword.IntM + "Mb");
             Console.WriteLine(ram.AvailablePhysicalMemory);
         }
     }

src/UnitTests/UnitTest1.cs

@@ -30,12 +30,12 @@ namespace NTMiner {
         public void GpuNameTest() {
             GpuName gpuName = new GpuName {
                 Name = "580 Series",
-                TotalMemory = 1024ul * 1024 * 1024 * 8
+                TotalMemory = NTKeyword.ULongG * 8
             };
             Console.WriteLine(gpuName.ToString());
             gpuName = new GpuName {
                 Name = "580 Series",
-                TotalMemory = (ulong)(1024ul * 1024 * 1024 * 7.9)
+                TotalMemory = (ulong)(NTKeyword.ULongG * 7.9)
             };
             Console.WriteLine(gpuName.ToString());
         }