From 7ee5241029060ecc7a63060b6244df93c81f6358 Mon Sep 17 00:00:00 2001 From: zzh Date: Fri, 25 Apr 2025 15:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E8=AF=BB=E5=A6=82?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=EF=BC=8C=E8=A7=A3=E6=9E=90block?= =?UTF-8?q?=E8=B7=A8buffer=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code.bak | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 code.bak diff --git a/code.bak b/code.bak deleted file mode 100644 index 4e92421..0000000 --- a/code.bak +++ /dev/null @@ -1,44 +0,0 @@ -// if (lastBufRemain < BLOCK_HEADER_LENGTH) { // 上次遗留的数据不够解析block 长度 -// memcpy(&preBlock[lastBufRemain], curBuf, BLOCK_HEADER_LENGTH); -// curReadPos += BLOCK_HEADER_LENGTH; -// lastBufRemain += BLOCK_HEADER_LENGTH; -// } -// blockLen = unpackInt16(&preBlock[16]) + 1; -// const int lenToRead = blockLen - lastBufRemain; -// memcpy(&preBlock[lastBufRemain], &curBuf[curReadPos], lenToRead); -// curReadPos += lenToRead; -// curStartAddrArr->push_back(&preBlock[0]); - - // curStartAddrArr->push_back(&curBuf[0]); - // spdlog::info("first blocklen: {}, remain: {}, toread: {}", blockLen, lastBufRemain, lenToRead); - // uint8_t buf[65535]; - // int block_length = unpackInt16(&preBlock[16]) + 1; - // uint32_t crc = le_to_u32(preBlock + block_length - 8); - // size_t dlen = 65535; - // int ret = bgzf_uncompress(buf, &dlen, (Bytef *)preBlock + 18, block_length - 18, crc); // 开头是header，得跳过 - // int bamLen = *(uint32_t *)(buf); - // spdlog::info("ret: {}, bamLen: {}, dlen: {}, block_length: {}", ret, bamLen, dlen, block_length); - // exit(0); - - // spdlog::info("read block len: {}", blockLen); - - // spdlog::info("cur block size: {}", curStartAddrArr->size()); - - PROF_G_BEG(read); - readState = fread(fbuf[4], 1, READ_BUFSIZE, fpr); - readState = fread(curBuf, 1, READ_BUFSIZE, fpr); - PROF_G_BEG(mem_copy); - memcpy(curBuf, fbuf[4], READ_BUFSIZE); - PROF_G_END(mem_copy); - PROF_G_END(read); - - // kt_for(nsgv::gSortArg.NUM_THREADS, mtUncompressBlock, &sortData, curStartAddrArr->size() / BATCH_SIZE); - // if (uncommpressedDataSize(sortData) >= nsgv::gSortArg.MAX_MEM) { - // kt_for(nsgv::gSortArg.NUM_THREADS, mtSortBlocks, &sortData, nsgv::gSortArg.NUM_THREADS); - // mergeSortedBlocks(sortData); - // } - - //setvbuf(fpr, (char*)fbuf[4], _IOFBF, 0); - //setvbuf(fpr, (char *)fbuf[4], _IONBF, READ_BUFSIZE); - - // const size_t READ_BUFSIZE = 8L * 1024 * 1024; \ No newline at end of file