update

wangzhengquan

2021-02-25 f71c50e9470d18afc9716378537c9cdfca315368

update

 CMakeLists.txt

@@ -30,4 +30,5 @@
    add_subdirectory(${PROJECT_SOURCE_DIR}/test)
    add_subdirectory(${PROJECT_SOURCE_DIR}/test_net_socket)
    add_subdirectory(${PROJECT_SOURCE_DIR}/test_socket)
    add_subdirectory(${PROJECT_SOURCE_DIR}/shm_util)
endif()

 shm_util/CMakeLists.txt

@@ -1,11 +1,34 @@
add_executable(shm_util shm_util.cpp )
target_link_libraries(shm_util PRIVATE shm_queue ${EXTRA_LIBS} )
target_include_directories(shm_util PRIVATE
                            "${PROJECT_BINARY_DIR}"
find_library(SHMQUEUE
    NAMES  shm_queue libshm_queue
    HINTS "/home/wzq/Downloads"
)


if(SHMQUEUE)
  message(STATUS "Looking for SHMQUEUE - found: ${SHMQUEUE}")
else()
  message(STATUS "Looking for SHMQUEUE - not found")
endif()

list(APPEND M_INCLUDES 
 ${PROJECT_BINARY_DIR}/src
 ${PROJECT_SOURCE_DIR}/src
 ${PROJECT_SOURCE_DIR}/src/shm
 ${PROJECT_SOURCE_DIR}/src/queue
 ${PROJECT_SOURCE_DIR}/src/socket
 ${PROJECT_SOURCE_DIR}/src/net
)

add_executable(shm_util2 shm_util.cpp )
target_link_libraries(shm_util2 PRIVATE ${SHMQUEUE} ${EXTRA_LIBS} )
target_include_directories(shm_util2 PRIVATE
                             ${PROJECT_BINARY_DIR}
                             ${EXTRA_INCLUDES}
                             ${M_INCLUDES}
                            )



add_executable(shm_map shm_map.cpp )
target_link_libraries(shm_map PRIVATE shm_queue ${EXTRA_LIBS} )
target_include_directories(shm_map PRIVATE

 shm_util/shm_util.cpp

File was deleted

 shm_util/shm_util.cpp

New file
@@ -0,0 +1 @@
../test_net_socket/shm_util.cpp

 test_net_socket/shm_util.cpp

@@ -526,9 +526,17 @@
}

void list () {
  LockFreeQueue<shm_packet_t> * mqueue;
  hashtable_t *hashtable = mm_get_hashtable();
  printf("%10s \t %10s\n", "KEY", "LENGTH");
  hashtable_foreach(hashtable, [&](int key, void * value){
    printf("%d\n", key);
    if(key >= 100 ) {
      mqueue = (LockFreeQueue<shm_packet_t> *)hashtable_get(hashtable, key);
      printf("%10d \t %10d\n", key, mqueue->size());
    } else {
      printf("%10d \t %10s\n", key, "");
    }
   
  });
}

@@ -820,7 +828,6 @@
  
  else if (strcmp("start_reply", fun) == 0) {
    opt =  parse_args(argc, argv);
    opt =  parse_args(argc, argv);
    if(opt.key == 0) {
      usage(argv[0]);
      exit(1);
@@ -889,7 +896,6 @@

  }

  printf("==========end========\n");
  // shm_mm_wrapper_destroy();
  shm_mm_wrapper_destroy();

}