SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@751 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2019-02-11 11:10:05 +00:00
parent dccb5cc7ea
commit bf414bec5e
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src_main/code/picodeparser.cpp
View File

@@ -946,10 +946,10 @@ PIString PICodeParser::procMacros(PIString fc) {
else skip = true; else skip = true;
ifcnt = 0; ifcnt = 0;
nfc.clear(); nfc.clear();
}// else { } else {
//if (!parseDirective(line.cutLeft(1).trim())) /*if (!*/parseDirective(line.cutLeft(1).trim())/*)*/
// ;//return false; /// WARNING: now skip errors ;//return false; /// WARNING: now skip errors
//} }
} else { } else {
if (grab) nfc << line << "\n"; if (grab) nfc << line << "\n";
else if (!skip) pfc << line << "\n"; else if (!skip) pfc << line << "\n";

4
src_main/containers/pideque.h
View File

@@ -448,7 +448,7 @@ private:
} }
pid_size = new_size; pid_size = new_size;
size_t as = asize(pid_start + new_size); size_t as = asize(pid_start + new_size);
if(as > 1000) piCout << "too much deque size" << new_size << as; //if(as > 1000) piCout << "too much deque size" << new_size << as;
if (as != pid_rsize) { if (as != pid_rsize) {
//printf("(%p) realloc %d -> %d (%p)\n", this, pid_rsize, as, pid_data); //printf("(%p) realloc %d -> %d (%p)\n", this, pid_rsize, as, pid_data);
PIINTROSPECTION_CONTAINER_ALLOC((as-pid_rsize)*sizeof(T)) PIINTROSPECTION_CONTAINER_ALLOC((as-pid_rsize)*sizeof(T))
@@ -465,7 +465,7 @@ private:
if (pid_start + start_offset < 0) if (pid_start + start_offset < 0)
as = asize(pid_rsize - start_offset); as = asize(pid_rsize - start_offset);
else as = pid_rsize; else as = pid_rsize;
if(as > 1000) piCout << "too much deque size" << new_size << as; //if(as > 1000) piCout << "too much deque size" << new_size << as;
//printf("%X alloc %d %d\n", this, pid_rsize, start_offset); //printf("%X alloc %d %d\n", this, pid_rsize, start_offset);
//printf("%X alloc %d %d %d %d %d %d\n", this, new_size, pid_size, pid_rsize, as, pid_start, start_offset); //printf("%X alloc %d %d %d %d %d %d\n", this, new_size, pid_size, pid_rsize, as, pid_start, start_offset);

2
src_main/containers/pivector.h
View File

@@ -359,7 +359,7 @@ private:
piv_size = new_size; piv_size = new_size;
size_t as = asize(new_size); size_t as = asize(new_size);
if (as == piv_rsize) return; if (as == piv_rsize) return;
if(as > 1000) piCout << "too much vector size" << new_size << as; //if(as > 1000) piCout << "too much vector size" << new_size << as;
//cout << std::hex << " ![("<<this<<")realloc " << piv_data << " data ... <\n" << endl; //cout << std::hex << " ![("<<this<<")realloc " << piv_data << " data ... <\n" << endl;
T * p_d = (T*)(realloc((void*)(piv_data), as*sizeof(T))); T * p_d = (T*)(realloc((void*)(piv_data), as*sizeof(T)));

8
src_main/thread/pithread.cpp
View File

@@ -224,7 +224,7 @@ bool PIThread::start(int timer_delay) {
# endif # endif
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
int ret = pthread_create(&PRIVATE->thread, &attr, thread_function, this); int ret = pthread_create(&PRIVATE->thread, &attr, thread_function, this);
piCout << "pthread_create" << PRIVATE->thread; //piCout << "pthread_create" << PRIVATE->thread;
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
if (ret == 0) { if (ret == 0) {
# ifdef MAC_OS # ifdef MAC_OS
@@ -268,7 +268,7 @@ bool PIThread::startOnce() {
# endif # endif
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
int ret = pthread_create(&(PRIVATE->thread), &attr, thread_function_once, this); int ret = pthread_create(&(PRIVATE->thread), &attr, thread_function_once, this);
piCout << "pthread_create" << PRIVATE->thread; //piCout << "pthread_create" << PRIVATE->thread;
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
if (ret == 0) { if (ret == 0) {
# ifdef MAC_OS # ifdef MAC_OS
@@ -469,7 +469,7 @@ void PIThread::__thread_func__(void * t) {
ct.terminating = ct.running_ = false; ct.terminating = ct.running_ = false;
ct.tid_ = -1; ct.tid_ = -1;
//cout << "thread " << t << " exiting ... " << endl; //cout << "thread " << t << " exiting ... " << endl;
piCout << "pthread_exit" << (ct.__privateinitializer__.p)->thread; //piCout << "pthread_exit" << (ct.__privateinitializer__.p)->thread;
UNREGISTER_THREAD(&ct); UNREGISTER_THREAD(&ct);
PIINTROSPECTION_UNREGISTER_THREAD(ct.tid()); PIINTROSPECTION_UNREGISTER_THREAD(ct.tid());
#ifndef WINDOWS #ifndef WINDOWS
@@ -518,7 +518,7 @@ void PIThread::__thread_func_once__(void * t) {
ct.terminating = ct.running_ = false; ct.terminating = ct.running_ = false;
ct.tid_ = -1; ct.tid_ = -1;
//cout << "thread " << t << " exiting ... " << endl; //cout << "thread " << t << " exiting ... " << endl;
piCout << "pthread_exit" << (ct.__privateinitializer__.p)->thread; //piCout << "pthread_exit" << (ct.__privateinitializer__.p)->thread;
UNREGISTER_THREAD(&ct); UNREGISTER_THREAD(&ct);
PIINTROSPECTION_UNREGISTER_THREAD(ct.tid()); PIINTROSPECTION_UNREGISTER_THREAD(ct.tid());
#ifndef WINDOWS #ifndef WINDOWS