Skip to content

Retry on ctags tagLine == null. Adjust ctags logging. #2561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2018
Merged

Retry on ctags tagLine == null. Adjust ctags logging. #2561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,20 @@ public Definitions doCtags(String file) throws IOException,
*
* @param bufferTags tags file output
* @return definitions parsed from buffer
* @throws java.lang.InterruptedException
*/
public Definitions testCtagsParser(String bufferTags) {
public Definitions testCtagsParser(String bufferTags)
throws InterruptedException {

// Ensure output is magic-terminated as expected.
StringBuilder tagsBuilder = new StringBuilder(bufferTags);
if (!bufferTags.endsWith("\n")) {
tagsBuilder.append("\n");
}
tagsBuilder.append(CTAGS_FILTER_TERMINATOR);
tagsBuilder.append("\n");
bufferTags = tagsBuilder.toString();

junit_testing = true;
ctagsOut = new BufferedReader(new StringReader(bufferTags));
ctags = new Process() {
Expand Down Expand Up @@ -429,11 +441,7 @@ public void destroy() {

CtagsReader rdr = new CtagsReader();
rdr.setTabSize(tabSize);
try {
readTags(rdr);
} catch (InterruptedException ex) {
LOGGER.log(Level.SEVERE, "readTags() test", ex);
}
readTags(rdr);
Definitions ret = rdr.getDefinitions();
return ret;
}
Expand All @@ -449,18 +457,22 @@ private void readTags(CtagsReader reader) throws InterruptedException {
//log.fine("Tagline:-->" + tagLine+"<----ONELINE");
if (tagLine == null) {
if (!junit_testing) {
LOGGER.warning("Unexpected end of file!");
LOGGER.warning("ctags: Unexpected end of file!");
}
try {
int val = ctags.exitValue();
if (!junit_testing) {
LOGGER.log(Level.WARNING, "ctags exited with code: {0}", val);
}
} catch (IllegalThreadStateException e) {
LOGGER.log(Level.WARNING, "ctags EOF but did not exit");
ctags.destroyForcibly();
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Ctags problem: ", e);
LOGGER.log(Level.WARNING, "ctags problem:", e);
ctags.destroyForcibly();
}
LOGGER.fine("Ctag read");
return;
// Throw the following to indicate non-I/O error for retry.
throw new InterruptedException("tagLine == null");
}

if (CTAGS_FILTER_TERMINATOR.equals(tagLine)) {
Expand Down