mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-02 13:55:39 +02:00
Code Issues Wiki Activity

Patch for Bogdan Gheorghe.

Browse source 
This patch fixes the indexer merge problem on large projects. 

Automation Test Suite run on Windows + Linux.
This commit is contained in:
John Camelon 2003-10-01 19:43:06 +00:00
parent c3b63fb508
commit 0d05a8342d
6 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.core/ChangeLog
View file

@ -1,3 +1,10 @@
2003-10-01 Bogdan Gheorghe
Modified CDTLogWriter: increased max log file size to 10MB; got rid of
the stack dumps/
* src/org/eclipse/cdt/internal/core/CDTLogWriter.java
2003-10-01 Rob Jackson 2003-10-01 Rob Jackson
Avoid a NPE when processing non-absolute FILE references in elf binaries Avoid a NPE when processing non-absolute FILE references in elf binaries

4
core/org.eclipse.cdt.core/index/ChangeLog
View file

@ -1,3 +1,7 @@
2003-10-01 Bogdan Gheorghe
Modified BlockIndexOutput.addInclude to properly flush an
include block once it's full.
2003-09-30 Bogdan Gheorghe 2003-09-30 Bogdan Gheorghe
Changed logging for SourceIndexer to log file in cdt.core Changed logging for SourceIndexer to log file in cdt.core

4
core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/BlocksIndexOutput.java
View file

@ -121,7 +121,7 @@ public class BlocksIndexOutput extends IndexOutput {
if (includeIndexBlock.isEmpty()) { if (includeIndexBlock.isEmpty()) {
return; return;
} }
flushWords(); flushIncludes();
addInclude(entry); addInclude(entry);
} }
} }
@ -179,7 +179,7 @@ public class BlocksIndexOutput extends IndexOutput {
/** /**
* *
*/ */
public void flushIncludes() throws IOException { protected void flushIncludes() throws IOException {
if (!firstInBlock if (!firstInBlock
&& includeIndexBlock != null) { // could have added a document without any indexed word, no block created yet && includeIndexBlock != null) { // could have added a document without any indexed word, no block created yet
includeIndexBlock.flush(); includeIndexBlock.flush();

4
core/org.eclipse.cdt.core/parser/ChangeLog
View file

@ -1,8 +1,12 @@
2003-10-01 Bogdan Gheorghe
Modified CDT log dump in Parser.fetchToken to include error message
2003-10-01 Andrew Niefer 2003-10-01 Andrew Niefer
bug43450 - Scanner needs to handle include paths that contain quotes bug43450 - Scanner needs to handle include paths that contain quotes
2003-09-30 Bogdan Gheorghe 2003-09-30 Bogdan Gheorghe
Added CDT log dump in Parser.fetchToken to catch HandleInclusion failures Added CDT log dump in Parser.fetchToken to catch HandleInclusion failures
2003-09-30 John Camelon 2003-09-30 John Camelon
Fixed Bug 43503 : Search:f_SD_01 cannot be found in ManyClasses20 Project Fixed Bug 43503 : Search:f_SD_01 cannot be found in ManyClasses20 Project
Fixed Bug 43680 : Fix Parser Error Handling Fixed Bug 43680 : Fix Parser Error Handling

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
View file

@ -4988,7 +4988,7 @@ public class Parser implements IParser
catch (ScannerException e) catch (ScannerException e)
{ {
Util.debugLog( "ScannerException thrown : " + e.getMessage(), IDebugLogConstants.PARSER ); Util.debugLog( "ScannerException thrown : " + e.getMessage(), IDebugLogConstants.PARSER );
org.eclipse.cdt.internal.core.model.Util.log(e, "Scanner Exception", ICLogConstants.CDT); //$NON-NLS-1$h org.eclipse.cdt.internal.core.model.Util.log(e, "Scanner Exception: " + e.getMessage() , ICLogConstants.CDT); //$NON-NLS-1$h
if( e.isSeriousError(mode) ) if( e.isSeriousError(mode) )
{ {
failParse(); failParse();

13
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDTLogWriter.java
View file

@ -34,14 +34,14 @@ public class CDTLogWriter {
protected boolean newSession = true; protected boolean newSession = true;
protected static final String SESSION = "*** SESSION";//$NON-NLS-1$ protected static final String SESSION = "*** SESSION";//$NON-NLS-1$
protected static final String ENTRY = "*** ENTRY";//$NON-NLS-1$ protected static final String ENTRY = "ENTRY";//$NON-NLS-1$
protected static final String SUBENTRY = "*** SUBENTRY";//$NON-NLS-1$ protected static final String SUBENTRY = "SUBENTRY";//$NON-NLS-1$
protected static final String MESSAGE = "*** MESSAGE";//$NON-NLS-1$ protected static final String MESSAGE = "MESSAGE";//$NON-NLS-1$
protected static final String STACK = "*** STACK";//$NON-NLS-1$ protected static final String STACK = "STACK";//$NON-NLS-1$
protected static final String LINE_SEPARATOR; protected static final String LINE_SEPARATOR;
protected static final String TAB_STRING = "\t";//$NON-NLS-1$ protected static final String TAB_STRING = "\t";//$NON-NLS-1$
protected static final long MAXLOG_SIZE = 5000000; protected static final long MAXLOG_SIZE = 10000000;
static { static {
String s = System.getProperty("line.separator");//$NON-NLS-1$ String s = System.getProperty("line.separator");//$NON-NLS-1$
LINE_SEPARATOR = s == null ? "\n" : s;//$NON-NLS-1$ LINE_SEPARATOR = s == null ? "\n" : s;//$NON-NLS-1$
@ -185,7 +185,8 @@ public class CDTLogWriter {
writeSpace(); writeSpace();
writeln(status.getMessage()); writeln(status.getMessage());
write(status.getException()); //Took out the stack dump - too much space
//write(status.getException());
if (status.isMultiStatus()) { if (status.isMultiStatus()) {
IStatus[] children = status.getChildren(); IStatus[] children = status.getChildren();