X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Ffind.c;h=0b0348f3d75093360dce9964cfaa4bc4f7e98deb;hb=c4f19a4c1ce2b200d4e18c880257a4389bd5368c;hp=74b712c464865e9f3a3f177c750a8c5a7ac9d961;hpb=011a59f5a54864108a16af570a6b287410597cc2;p=debian%2Famanda diff --git a/server-src/find.c b/server-src/find.c index 74b712c..0b0348f 100644 --- a/server-src/find.c +++ b/server-src/find.c @@ -48,6 +48,7 @@ static gboolean logfile_has_tape(char * label, char * datestamp, char * logfile); static char *find_sort_order = NULL; +static GStringChunk *string_chunk = NULL; find_result_t * find_dump(disklist_t* diskqp) { char *conf_logdir, *logfile = NULL; @@ -57,6 +58,9 @@ find_result_t * find_dump(disklist_t* diskqp) { find_result_t *output_find = NULL; gboolean *tape_seen = NULL; + if (string_chunk == NULL) { + string_chunk = g_string_chunk_new(32768); + } conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR)); maxtape = lookup_nb_tape(); tape_seen = g_new0(gboolean, maxtape+1); @@ -225,6 +229,10 @@ search_holding_disk( holding_file_list = holding_get_files(NULL, 1); + if (string_chunk == NULL) { + string_chunk = g_string_chunk_new(32768); + } + for(e = holding_file_list; e != NULL; e = e->next) { dumpfile_t file; @@ -263,24 +271,26 @@ search_holding_disk( if(find_match(file.name,file.disk)) { find_result_t *new_output_find = g_new0(find_result_t, 1); new_output_find->next=*output_find; - new_output_find->timestamp = stralloc(file.datestamp); - new_output_find->write_timestamp = stralloc("00000000000000"); - new_output_find->hostname = stralloc(file.name); - new_output_find->diskname = stralloc(file.disk); + new_output_find->timestamp = g_string_chunk_insert_const(string_chunk, file.datestamp); + new_output_find->write_timestamp = g_string_chunk_insert_const(string_chunk, "00000000000000"); + new_output_find->hostname = g_string_chunk_insert_const(string_chunk, file.name); + new_output_find->diskname = g_string_chunk_insert_const(string_chunk, file.disk); new_output_find->level=file.dumplevel; - new_output_find->label=stralloc(holding_file); + new_output_find->label=g_string_chunk_insert_const(string_chunk, holding_file); new_output_find->partnum = -1; new_output_find->totalparts = -1; new_output_find->filenum=0; if (file.is_partial) { - new_output_find->status=stralloc("PARTIAL"); - new_output_find->dump_status=stralloc("PARTIAL"); + new_output_find->status="PARTIAL"; + new_output_find->dump_status="PARTIAL"; } else { - new_output_find->status=stralloc("OK"); - new_output_find->dump_status=stralloc("OK"); + new_output_find->status="OK"; + new_output_find->dump_status="OK"; } - new_output_find->message=stralloc(""); + new_output_find->message=""; new_output_find->kb = holding_file_size(holding_file, 1); + new_output_find->bytes = 0; + new_output_find->orig_kb = file.orig_size; *output_find=new_output_find; @@ -513,14 +523,6 @@ free_find_result( output_find_result; output_find_result=output_find_result->next) { amfree(prev); - amfree(output_find_result->timestamp); - amfree(output_find_result->write_timestamp); - amfree(output_find_result->hostname); - amfree(output_find_result->diskname); - amfree(output_find_result->label); - amfree(output_find_result->status); - amfree(output_find_result->dump_status); - amfree(output_find_result->message); prev = output_find_result; } amfree(prev); @@ -624,9 +626,10 @@ parse_taper_datestamp_log( return 0; } *label = s - 1; - skip_non_whitespace(s, ch); + skip_quoted_string(s, ch); s[-1] = '\0'; + *label = unquote_string(*label); return 1; } @@ -634,7 +637,7 @@ parse_taper_datestamp_log( static gboolean logfile_has_tape(char * label, char * datestamp, char * logfile) { FILE * logf; - char * ck_datestamp, *ck_label; + char * ck_datestamp, *ck_label = NULL; if((logf = fopen(logfile, "r")) == NULL) { error(_("could not open logfile %s: %s"), logfile, strerror(errno)); /*NOTREACHED*/ @@ -648,9 +651,11 @@ static gboolean logfile_has_tape(char * label, char * datestamp, logfile, curstr); } else if(strcmp(ck_datestamp, datestamp) == 0 && strcmp(ck_label, label) == 0) { + amfree(ck_label); afclose(logf); return TRUE; } + amfree(ck_label); } } @@ -706,7 +711,8 @@ search_logfile( char *ck_label=NULL; int level = 0; off_t filenum; - char *ck_datestamp, *datestamp; + char *ck_datestamp=NULL; + char *datestamp; char *s; int ch; disk_t *dp; @@ -718,12 +724,16 @@ search_logfile( gboolean found_something = FALSE; double sec; off_t kb; + off_t bytes; off_t orig_kb; int taper_part = 0; g_return_val_if_fail(output_find != NULL, 0); g_return_val_if_fail(logfile != NULL, 0); + if (string_chunk == NULL) { + string_chunk = g_string_chunk_new(32768); + } valid_label = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); part_by_dle = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); datestamp = g_strdup(passed_datestamp); @@ -736,6 +746,8 @@ search_logfile( filenum = (off_t)0; while(get_logline(logf)) { if (curlog == L_START && curprog == P_TAPER) { + amfree(ck_label); + ck_datestamp = NULL; if(parse_taper_datestamp_log(curstr, &ck_datestamp, &ck_label) == 0) { g_printf(_("strange log line in %s \"start taper %s\"\n"), @@ -746,6 +758,7 @@ search_logfile( if (strcmp(datestamp, ck_datestamp) != 0) { g_printf(_("Log file %s stamped %s, expecting %s!\n"), logfile, ck_datestamp, datestamp); + amfree(ck_label); break; } } @@ -759,12 +772,15 @@ search_logfile( found_something = TRUE; } amfree(current_label); - current_label = g_strdup(ck_label); + current_label = ck_label; + ck_label = NULL; if (datestamp == NULL) { datestamp = g_strdup(ck_datestamp); } filenum = (off_t)0; } + if (!datestamp) + continue; if (right_label && (curlog == L_SUCCESS || curlog == L_CHUNK || curlog == L_PART || curlog == L_PARTPARTIAL) && @@ -791,15 +807,19 @@ search_logfile( } if (curlog == L_PART || curlog == L_PARTPARTIAL) { - char * part_label = s - 1; + char *part_label; + char *qpart_label = s - 1; taper_part++; - skip_non_whitespace(s, ch); + skip_quoted_string(s, ch); s[-1] = '\0'; - if (!g_hash_table_lookup(valid_label, part_label)) + part_label = unquote_string(qpart_label); + if (!g_hash_table_lookup(valid_label, part_label)) { + amfree(part_label); continue; + } amfree(current_label); - current_label = stralloc(part_label); + current_label = part_label; skip_whitespace(s, ch); if(ch == '\0') { @@ -858,26 +878,37 @@ search_logfile( level = atoi(date); date = stralloc(datestamp); partnum = 1; - totalparts =1; + totalparts = 1; } else { if (curprog == P_TAPER && (curlog == L_CHUNK || curlog == L_PART || curlog == L_PARTPARTIAL || curlog == L_PARTIAL || curlog == L_DONE)) { + char *s1, ch1; skip_whitespace(s, ch); number = s - 1; skip_non_whitespace(s, ch); - s[-1] = '\0'; - sscanf(number, "%d/%d", &partnum, &totalparts); - if (partnum > maxparts) - maxparts = partnum; - if (totalparts > maxparts) - maxparts = totalparts; + s1 = &s[-1]; + ch1 = *s1; + skip_whitespace(s, ch); + if (*(s-1) != '[') { + *s1 = ch1; + sscanf(number, "%d/%d", &partnum, &totalparts); + if (partnum > maxparts) + maxparts = partnum; + if (totalparts > maxparts) + maxparts = totalparts; + } else { /* nparts is not in all PARTIAL lines */ + partnum = 1; + totalparts = 1; + s = number + 1; + } + } else { + skip_whitespace(s, ch); } - skip_whitespace(s, ch); if(ch == '\0' || sscanf(s - 1, "%d", &level) != 1) { - g_printf(_("strange log line in %s \"%s\"\n"), - logfile, curstr); + g_printf(_("Fstrange log line in %s \"%s\"\n"), + logfile, s-1); continue; } skip_integer(s, ch); @@ -907,7 +938,8 @@ search_logfile( skip_non_whitespace(s, ch); rest_undo = s - 1; *rest_undo = '\0'; - if (strcmp(rest, "kb") != 0) { + if (strcmp(rest, "kb") != 0 && + strcmp(rest, "bytes") != 0) { g_printf(_("Bstrange log line in %s \"%s\"\n"), logfile, curstr); continue; @@ -919,7 +951,13 @@ search_logfile( logfile, curstr); continue; } - kb = atof(s - 1); + if (strcmp(rest, "kb") == 0) { + kb = atof(s - 1); + bytes = 0; + } else { + bytes = atof(s - 1); + kb = bytes / 1024; + } skip_non_whitespace(s, ch); skip_whitespace(s, ch); rest = s - 1; @@ -960,6 +998,7 @@ search_logfile( } else { sec = 0; kb = 0; + bytes = 0; orig_kb = 0; *rest_undo = ' '; } @@ -982,25 +1021,37 @@ search_logfile( host, disk, date, level); find_result_t *new_output_find = g_new0(find_result_t, 1); part_find = g_hash_table_lookup(part_by_dle, key); - new_output_find->timestamp = stralloc(date); - new_output_find->write_timestamp = stralloc(datestamp); - new_output_find->hostname=stralloc(host); - new_output_find->diskname=stralloc(disk); + maxparts = partnum; + if (maxparts < totalparts) + maxparts = totalparts; + for (a_part_find = part_find; + a_part_find; + a_part_find = a_part_find->next) { + if (maxparts < a_part_find->partnum) + maxparts = a_part_find->partnum; + if (maxparts < a_part_find->totalparts) + maxparts = a_part_find->totalparts; + } + new_output_find->timestamp = g_string_chunk_insert_const(string_chunk, date); + new_output_find->write_timestamp = g_string_chunk_insert_const(string_chunk, datestamp); + new_output_find->hostname=g_string_chunk_insert_const(string_chunk, host); + new_output_find->diskname=g_string_chunk_insert_const(string_chunk, disk); new_output_find->level=level; new_output_find->partnum = partnum; new_output_find->totalparts = totalparts; - new_output_find->label=stralloc(current_label); + new_output_find->label=g_string_chunk_insert_const(string_chunk, current_label); new_output_find->status=NULL; new_output_find->dump_status=NULL; - new_output_find->message=stralloc(""); + new_output_find->message=""; new_output_find->filenum=filenum; new_output_find->sec=sec; new_output_find->kb=kb; + new_output_find->bytes=bytes; new_output_find->orig_kb=orig_kb; new_output_find->next=NULL; if (curlog == L_SUCCESS) { - new_output_find->status = stralloc("OK"); - new_output_find->dump_status = stralloc("OK"); + new_output_find->status = "OK"; + new_output_find->dump_status = "OK"; new_output_find->next = *output_find; new_output_find->partnum = 1; /* L_SUCCESS is pre-splitting */ *output_find = new_output_find; @@ -1013,13 +1064,11 @@ search_logfile( for (a_part_find = part_find; a_part_find; a_part_find = a_part_find->next) { - amfree(a_part_find->dump_status); if (curlog == L_PARTIAL) - a_part_find->dump_status = stralloc("PARTIAL"); + a_part_find->dump_status = "PARTIAL"; else { - a_part_find->dump_status = stralloc("FAIL"); - amfree(a_part_find->message); - a_part_find->message = stralloc(rest); + a_part_find->dump_status = "FAIL"; + a_part_find->message = g_string_chunk_insert_const(string_chunk, rest); } } } else { @@ -1037,16 +1086,12 @@ search_logfile( for (a_part_find = part_find; a_part_find; a_part_find = a_part_find->next) { - amfree(a_part_find->dump_status); if (num_part == 0) { - a_part_find->dump_status = - stralloc("OK"); + a_part_find->dump_status = "OK"; } else { - a_part_find->dump_status = - stralloc("FAIL"); - amfree(a_part_find->message); + a_part_find->dump_status = "FAIL"; a_part_find->message = - stralloc("Missing part"); + g_string_chunk_insert_const(string_chunk, "Missing part"); } } } @@ -1079,11 +1124,11 @@ search_logfile( free_find_result(&new_output_find); } else { /* part line */ if (curlog == L_PART || curlog == L_CHUNK) { - new_output_find->status=stralloc("OK"); - new_output_find->dump_status=stralloc("OK"); + new_output_find->status = "OK"; + new_output_find->dump_status = "OK"; } else { /* PARTPARTIAL */ - new_output_find->status=stralloc("PARTIAL"); - new_output_find->dump_status=stralloc("PARTIAL"); + new_output_find->status = "PARTIAL"; + new_output_find->dump_status = "PARTIAL"; } /* Add to part_find list */ if (part_find) { @@ -1100,16 +1145,17 @@ search_logfile( amfree(key); } else if(curlog == L_FAIL) { + char *status_failed; /* print other failures too -- this is a hack to ensure that failures which * did not make it to tape are also listed in the output of 'amadmin x find'; * users that do not want this information (e.g., Amanda::DB::Catalog) should * filter dumps with a NULL label. */ find_result_t *new_output_find = g_new0(find_result_t, 1); new_output_find->next = *output_find; - new_output_find->timestamp = stralloc(date); + new_output_find->timestamp = g_string_chunk_insert_const(string_chunk, date); new_output_find->write_timestamp = g_strdup("00000000000000"); /* dump was not written.. */ - new_output_find->hostname=stralloc(host); - new_output_find->diskname=stralloc(disk); + new_output_find->hostname=g_string_chunk_insert_const(string_chunk, host); + new_output_find->diskname=g_string_chunk_insert_const(string_chunk, disk); new_output_find->level=level; new_output_find->label=NULL; new_output_find->partnum=partnum; @@ -1117,15 +1163,18 @@ search_logfile( new_output_find->filenum=0; new_output_find->sec=sec; new_output_find->kb=kb; - new_output_find->kb=orig_kb; - new_output_find->status=vstralloc( + new_output_find->bytes=bytes; + new_output_find->orig_kb=orig_kb; + status_failed = vstralloc( "FAILED (", program_str[(int)curprog], ") ", rest, NULL); - new_output_find->dump_status=stralloc(""); - new_output_find->message=stralloc(""); + new_output_find->status = g_string_chunk_insert_const(string_chunk, status_failed); + amfree(status_failed); + new_output_find->dump_status=""; + new_output_find->message=""; *output_find=new_output_find; found_something = TRUE; maxparts = -1; @@ -1179,19 +1228,20 @@ dumps_match( find_result_t *curmatch = g_new0(find_result_t, 1); memcpy(curmatch, cur_result, SIZEOF(find_result_t)); - curmatch->timestamp = stralloc(cur_result->timestamp); - curmatch->write_timestamp = stralloc(cur_result->write_timestamp); - curmatch->hostname = stralloc(cur_result->hostname); - curmatch->diskname = stralloc(cur_result->diskname); + curmatch->timestamp = cur_result->timestamp; + curmatch->write_timestamp = cur_result->write_timestamp; + curmatch->hostname = cur_result->hostname; + curmatch->diskname = cur_result->diskname; curmatch->level = cur_result->level; - curmatch->label = cur_result->label? stralloc(cur_result->label) : NULL; + curmatch->label = cur_result->label? cur_result->label : NULL; curmatch->filenum = cur_result->filenum; curmatch->sec = cur_result->sec; curmatch->kb = cur_result->kb; + curmatch->bytes = cur_result->bytes; curmatch->orig_kb = cur_result->orig_kb; - curmatch->status = stralloc(cur_result->status); - curmatch->dump_status = stralloc(cur_result->dump_status); - curmatch->message = stralloc(cur_result->message); + curmatch->status = cur_result->status; + curmatch->dump_status = cur_result->dump_status; + curmatch->message = cur_result->message; curmatch->partnum = cur_result->partnum; curmatch->totalparts = cur_result->totalparts; curmatch->next = matches; @@ -1257,16 +1307,16 @@ dumps_match_dumpspecs( find_result_t *curmatch = alloc(SIZEOF(find_result_t)); memcpy(curmatch, cur_result, SIZEOF(find_result_t)); - curmatch->timestamp = stralloc(cur_result->timestamp); - curmatch->write_timestamp = stralloc(cur_result->write_timestamp); - curmatch->hostname = stralloc(cur_result->hostname); - curmatch->diskname = stralloc(cur_result->diskname); + curmatch->timestamp = cur_result->timestamp; + curmatch->write_timestamp = cur_result->write_timestamp; + curmatch->hostname = cur_result->hostname; + curmatch->diskname = cur_result->diskname; curmatch->level = cur_result->level; - curmatch->label = cur_result->label? stralloc(cur_result->label) : NULL; + curmatch->label = cur_result->label? cur_result->label : NULL; curmatch->filenum = cur_result->filenum; - curmatch->status = stralloc(cur_result->status); - curmatch->dump_status = stralloc(cur_result->dump_status); - curmatch->message = stralloc(cur_result->message); + curmatch->status = cur_result->status; + curmatch->dump_status = cur_result->dump_status; + curmatch->message = cur_result->message; curmatch->partnum = cur_result->partnum; curmatch->totalparts = cur_result->totalparts;