update

CMakeLists.txt

@@ -4,7 +4,7 @@ project(prime_numbers_c C)
 set(CMAKE_C_STANDARD 99)
 
 add_executable(prime_numbers_c main.c)
-add_executable(bit_set bit_set.c)
+add_executable(bit_set bit_set.c time.h)
 IF (CMAKE_SYSTEM_NAME MATCHES "Windows")
     target_link_libraries(prime_numbers_c)
     target_link_libraries(bit_set)

bit_set.c

@@ -4,27 +4,13 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
+#include "time.h"
 
-//#define _WIN32
-
-#ifdef _WIN32
-#include <Windows.h>
-long getCurrentTime() {
-    LARGE_INTEGER freq;
-    QueryPerformanceCounter(&freq);
-    return (long) freq.QuadPart / 10;
-}
-#else
-
-#include <sys/time.h>
-
-long getCurrentTime() {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return tv.tv_sec * 1000 * 1000 + tv.tv_usec;
-}
-
-#endif
+#define bitIndex(i) (1 << ((i) & 7))
+#define bitIsUp(arr, i) arr[(i) >> 3] & bitIndex(i)
+#define bitDown(arr, i) arr[(i) >> 3] &= ~bitIndex(i)
+//#define isPrime(num, bitMap) ((num) < 2 ? false : (num) == 2 ? true : !((num) & 1) ? false :\
+//bitIsUp(bitMap, (num) >> 1))
 
 /**
  * 判断字符串转换为无符号整型是否会溢出
@@ -57,9 +43,9 @@ void getPrimeNumbers(unsigned long maxNumber, unsigned char *buffer) {
     unsigned char arr[] = {219, 182, 109};
     unsigned char initIndexArr[] = {1, 2, 0};
     unsigned char initIndex = 0;
-    unsigned char *endP = buffer + needSize;
 
     // 初始化缓冲区
+    unsigned char *endP = buffer + needSize;
     for (unsigned char *k = buffer + 1; k < endP; ++k) {
         *k = arr[initIndex];
         initIndex = initIndexArr[initIndex];
@@ -67,21 +53,21 @@ void getPrimeNumbers(unsigned long maxNumber, unsigned char *buffer) {
     *buffer = 0x6e;
 
     // 进行计算
-    unsigned int sqrtMaxNumber = (unsigned int) sqrt(maxNumber) >> 1;
+    unsigned int sqrtMaxNumber = (unsigned int) sqrt((double) maxNumber) >> 1;
     maxNumber >>= 1;
     for (size_t i = 2; i <= sqrtMaxNumber; i++) {
-        if (buffer[i >> 3] & 1 << (i & 7)) {
+        if (bitIsUp(buffer, i)) {
             size_t doubleI = i + i + 1;
             for (size_t j = (doubleI * doubleI) >> 1; j < maxNumber; j += doubleI) {
-                buffer[j >> 3] &= ~(1 << (j & 7));
+                bitDown(buffer, j);
             }
         }
     }
 
     // 去除多余结果
     needSize <<= 3;
-    for (int l = maxNumber; l < needSize; l++) {
-        buffer[l >> 3] &= ~(1 << (l & 7));
+    for (unsigned long l = maxNumber; l < needSize; l++) {
+        buffer[l >> 3] &= ~bitIndex(l);
     }
 }
 
@@ -134,15 +120,7 @@ bool true = 1;
 #pragma ide diagnostic ignored "hicpp-signed-bitwise"
 
 bool isPrime(unsigned int num, const unsigned char *bitMap) {
-    if (num < 2) {
-        return false;
-    } else if (num == 2) {
-        return true;
-    } else if (!(num & 1)) {
-        return false; // 偶数
-    } else {
-        return bitMap[num >> 4] & (1 << ((num >> 1) & 7));
-    }
+    return num < 2 ? false : num == 2 ? true : !(num & 1) ? false : bitIsUp(bitMap, num >> 1);
 }
 
 #pragma clang diagnostic pop
@@ -153,6 +131,7 @@ bool isPrime(unsigned int num, const unsigned char *bitMap) {
 int main(int argc, char *argv[]) {
     //必须给定最大值
     if (argc <= 1) {
+        printf("require maximum number");
         return 1;
     }
 
@@ -195,7 +174,6 @@ int main(int argc, char *argv[]) {
     if (output) {
         printf(maxNum < 100001 ? "2 " : "2\n");
         for (int i = 3; i <= maxNum; i += 2) {
-//			if (buff[i >> 4] & (1 << ((i >> 1) & 7))) { // NOLINT(hicpp-signed-bitwise)
             if (isPrime(i, buff)) {
                 printf(maxNum < 100001 ? "%d " : "%d\n", i);
             }

main.c

@@ -1,12 +1,12 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunknown-pragmas"
 #pragma ide diagnostic ignored "hicpp-signed-bitwise"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <event.h>
-#include <glob.h>
+#include "time.h"
 
 /**
  * 判断字符串转换为无符号整型是否会溢出
@@ -32,9 +32,10 @@ size_t neededSize(unsigned long maxNumber) {
 
 void getPrimeNumbers(unsigned int maxNumber, unsigned char *buffer) {
     size_t needSize = neededSize(maxNumber);
-	for (int k = 1; k < needSize; ++k) {
-		buffer[k] = 0xff;
-	}
+    memset(buffer + 1, 0xff, needSize - 1);
+//	for (int k = 1; k < needSize; ++k) {
+//		buffer[k] = 0xff;
+//	}
     *buffer = 0xfe;
     unsigned int sqrtMaxNumber = (unsigned int) sqrt(maxNumber);
     for (size_t i = 3; i <= sqrtMaxNumber; i += 2) {
@@ -51,12 +52,6 @@ void getPrimeNumbers(unsigned int maxNumber, unsigned char *buffer) {
     }
 }
 
-long getCurrentTime() {
-	struct timeval tv;
-	gettimeofday(&tv, NULL);
-	return tv.tv_sec * 1000 * 1000 + tv.tv_usec;
-}
-
 char ByteCode(unsigned char n) {
     static const char table[256] = {
             0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
@@ -99,6 +94,7 @@ unsigned int getPrimeCount(unsigned char *buff, size_t buffSize) {
 int main(int argc, char *argv[]) {
     //必须给定最大值
     if (argc <= 1) {
+        printf("require maximum number");
         return 1;
     }
 
@@ -146,9 +142,9 @@ int main(int argc, char *argv[]) {
             }
         }
     }
-	printf("\n%u numbers\nusing time:%li us, %li ms\n",
-	       getPrimeCount(buff, neededSize(maxNum)),
-	       t2 - t1, (t2 - t1) / 1000);
+    printf("\nmax number: %u, find %u prime numbers\nusing time: %li s %li ms %li us\n",
+           maxNum, getPrimeCount(buff, neededSize(maxNum)),
+           (t2 - t1) / 1000 / 1000, (t2 - t1) / 1000 % 1000, (t2 - t1) % 1000);
     free(buff);
     return 0;
 }

time.h

@@ -0,0 +1,27 @@
+//
+// Created by tursom on 2021/3/24.
+//
+
+#ifndef PRIME_NUMBERS_C_TIME_H
+#define PRIME_NUMBERS_C_TIME_H
+
+#ifdef _WIN32
+#include <Windows.h>
+long getCurrentTime() {
+    LARGE_INTEGER freq;
+    QueryPerformanceCounter(&freq);
+    return (long) freq.QuadPart / 10;
+}
+#else
+
+#include <sys/time.h>
+
+long getCurrentTime() {
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return tv.tv_sec * 1000 * 1000 + tv.tv_usec;
+}
+
+#endif
+
+#endif //PRIME_NUMBERS_C_TIME_H