update Makefile

lh3 · Oct 1, 2024 · d0825a1 · d0825a1
1 parent f122e5d
commit d0825a1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 46 deletions.
diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ map.o: mppriv.h miniprot.h nasw.h kalloc.h kseq.h kthread.h kvec-km.h
 misc.o: mppriv.h miniprot.h nasw.h kalloc.h kseq.h ksort.h
 nasw-sse.o: nasw.h kalloc.h
 nasw-tab.o: nasw.h kalloc.h
-ntseq.o: mppriv.h miniprot.h nasw.h kalloc.h kseq.h
+ntseq.o: mppriv.h miniprot.h nasw.h kalloc.h kseq.h khashl-km.h
 options.o: miniprot.h nasw.h kalloc.h
 sketch.o: mppriv.h miniprot.h nasw.h kalloc.h kseq.h kvec-km.h
 sys.o: mppriv.h miniprot.h nasw.h kalloc.h kseq.h
diff --git a/kalloc.h b/kalloc.h
@@ -41,50 +41,5 @@ void km_stat_print(const void *km);
 
 #define KMALLOC(km, ptr, len) ((ptr) = (__typeof__(ptr))kmalloc((km), (len) * sizeof(*(ptr))))
 #define KCALLOC(km, ptr, len) ((ptr) = (__typeof__(ptr))kcalloc((km), (len), sizeof(*(ptr))))
-#define KREALLOC(km, ptr, len) ((ptr) = (__typeof__(ptr))krealloc((km), (ptr), (len) * sizeof(*(ptr))))
-
-#define KEXPAND(km, a, m) do { \
-		(m) = (m) >= 4? (m) + ((m)>>1) : 16; \
-		KREALLOC((km), (a), (m)); \
-	} while (0)
-
-#ifndef klib_unused
-#if (defined __clang__ && __clang_major__ >= 3) || (defined __GNUC__ && __GNUC__ >= 3)
-#define klib_unused __attribute__ ((__unused__))
-#else
-#define klib_unused
-#endif
-#endif /* klib_unused */
-
-#define KALLOC_POOL_INIT2(SCOPE, name, kmptype_t) \
-	typedef struct { \
-		size_t cnt, n, max; \
-		kmptype_t **buf; \
-		void *km; \
-	} kmp_##name##_t; \
-	SCOPE kmp_##name##_t *kmp_init_##name(void *km) { \
-		kmp_##name##_t *mp; \
-		KCALLOC(km, mp, 1); \
-		mp->km = km; \
-		return mp; \
-	} \
-	SCOPE void kmp_destroy_##name(kmp_##name##_t *mp) { \
-		size_t k; \
-		for (k = 0; k < mp->n; ++k) kfree(mp->km, mp->buf[k]); \
-		kfree(mp->km, mp->buf); kfree(mp->km, mp); \
-	} \
-	SCOPE kmptype_t *kmp_alloc_##name(kmp_##name##_t *mp) { \
-		++mp->cnt; \
-		if (mp->n == 0) return (kmptype_t*)kcalloc(mp->km, 1, sizeof(kmptype_t)); \
-		return mp->buf[--mp->n]; \
-	} \
-	SCOPE void kmp_free_##name(kmp_##name##_t *mp, kmptype_t *p) { \
-		--mp->cnt; \
-		if (mp->n == mp->max) KEXPAND(mp->km, mp->buf, mp->max); \
-		mp->buf[mp->n++] = p; \
-	}
-
-#define KALLOC_POOL_INIT(name, kmptype_t) \
-	KALLOC_POOL_INIT2(static inline klib_unused, name, kmptype_t)
 
 #endif