1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
--- trunk/c++/src/app/netcache/nc_memory.cpp 2011/12/16 17:42:54 52330
+++ trunk/c++/src/app/netcache/nc_memory.cpp 2012/02/27 14:38:30 53136
@@ -360,7 +360,7 @@
m_ObjLock.Lock();
++m_SysFrees;
m_SystemMem -= alloced_size;
- m_LostMem -= alloced_size -= asked_size;
+ m_LostMem -= alloced_size - asked_size;
m_ObjLock.Unlock();
}
@@ -2539,7 +2539,7 @@
bool
CNCMemManager::InitializeApp(void)
{
- try {
+ /*try {
CSQLITE_Global::SetCustomMallocFuncs(&s_NCMallocMethods);
}
catch (CSQLITE_Exception& ex) {
@@ -2547,13 +2547,15 @@
return false;
}
- return CNCMMCentral::RunLateInit();
+ return CNCMMCentral::RunLateInit();*/
+ g_InitNCThreadIndexes();
+ return true;
}
void
CNCMemManager::FinalizeApp(void)
{
- CNCMMCentral::PrepareToStop();
+ //CNCMMCentral::PrepareToStop();
}
void
@@ -2571,28 +2573,29 @@
void
CNCMemManager::PrintStats(CPrintTextProxy& proxy)
{
- CNCMMStats stats_sum;
+ /*CNCMMStats stats_sum;
CNCMMStats::CollectAllStats(&stats_sum);
- stats_sum.Print(proxy);
+ stats_sum.Print(proxy);*/
}
size_t
CNCMemManager::GetMemoryLimit(void)
{
- return CNCMMCentral::GetMemLimit();
+ return 0;//CNCMMCentral::GetMemLimit();
}
size_t
CNCMemManager::GetMemoryUsed(void)
{
- CNCMMStats stat;
+ /*CNCMMStats stat;
CNCMMStats::CollectAllStats(&stat);
- return stat.GetSystemMem();
+ return stat.GetSystemMem();*/
+ return 0;
}
END_NCBI_SCOPE
-
+/*
void*
operator new (size_t size)
#ifndef NCBI_COMPILER_MSVC
@@ -2626,13 +2629,13 @@
{
NCBI_NS_NCBI::CNCMMCentral::DeallocMemory(ptr);
}
-
+*/
#ifdef __GLIBC__
// glibc has special method of overriding C library allocation functions.
#include <malloc.h>
-
+/*
void* s_NCMallocHook(size_t size, const void* caller)
{
return NCBI_NS_NCBI::CNCMMCentral::AllocMemory(size);
@@ -2656,7 +2659,7 @@
}
void (*__malloc_initialize_hook) (void) = s_NCInitMallocHook;
-
+*/
#elif !defined(NCBI_OS_MSWIN)
// Changing of C library allocation functions on Windows is very tricky (if
// possible at all) and NetCache will never run in production on Windows. So
|
GitWeb