vim: src/quickfix.c comparison

comparison src/quickfix.c @ 14915:f508bb2fb808 v8.1.0469

patch 8.1.0469: too often indexing in qf_lists[] commit https://github.com/vim/vim/commit/108e7b422b7b59153dd5af1fb75e83fa36ff3db4 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 11 17:39:12 2018 +0200 patch 8.1.0469: too often indexing in qf_lists[] Problem: Too often indexing in qf_lists[]. Solution: Use a qf_list_T pointer. (Yegappan Lakshmanan)

author	Bram Moolenaar <Bram@vim.org>
date	Thu, 11 Oct 2018 17:45:07 +0200
parents	e35d98651e56
children	69d2749a6a2f

comparison

equal deleted inserted replaced

-:68eba5f83aed
+:f508bb2fb808
 EMSG(_(e_readerrf));
 error2:
 if (!adding)
 {
 	// Error when creating a new list. Free the new list
-	qf_free(&qi->qf_lists[qi->qf_curlist]);
+	qf_free(qfl);
 	qi->qf_listcount--;
 	if (qi->qf_curlist > 0)
 	    --qi->qf_curlist;
 }
 qf_init_end:
 */
 static void
 qf_new_list(qf_info_T *qi, char_u *qf_title)
 {
 int		i;
+qf_list_T	*qfl;
 // If the current entry is not the last entry, delete entries beyond
 // the current entry.  This makes it possible to browse in a tree-like
 // way with ":grep'.
 while (qi->qf_listcount > qi->qf_curlist + 1)
 	    qi->qf_lists[i - 1] = qi->qf_lists[i];
 	qi->qf_curlist = LISTCOUNT - 1;
 }
 else
 	qi->qf_curlist = qi->qf_listcount++;
-vim_memset(&qi->qf_lists[qi->qf_curlist], 0, (size_t)(sizeof(qf_list_T)));
+qfl = &qi->qf_lists[qi->qf_curlist];
-qf_store_title(&qi->qf_lists[qi->qf_curlist], qf_title);
+vim_memset(qfl, 0, (size_t)(sizeof(qf_list_T)));
-qi->qf_lists[qi->qf_curlist].qf_id = ++last_qf_id;
+qf_store_title(qfl, qf_title);
+qfl->qf_id = ++last_qf_id;
 }
 /*
 * Free a location list stack
 */
 * Also sets the b_has_qf_entry flag.
 */
 static int
 qf_get_fnum(qf_info_T *qi, int qf_idx, char_u *directory, char_u *fname)
 {
+qf_list_T	*qfl = &qi->qf_lists[qf_idx];
 char_u	*ptr = NULL;
 buf_T	*buf;
 char_u	*bufname;
 if (fname == NULL || *fname == NUL)		// no file name
 	// "leaving directory"-messages we might have missed a
 	// directory change.
 	if (mch_getperm(ptr) < 0)
 	{
 	    vim_free(ptr);
-	    directory = qf_guess_filepath(&qi->qf_lists[qf_idx], fname);
+	    directory = qf_guess_filepath(qfl, fname);
 	    if (directory)
 		ptr = concat_fnames(directory, fname, TRUE);
 	    else
 		ptr = vim_strsave(fname);
 	}
 */
 void
 ex_cwindow(exarg_T *eap)
 {
 qf_info_T	*qi = &ql_info;
+qf_list_T	*qfl;
 win_T	*win;
 if (is_loclist_cmd(eap->cmdidx))
 {
 	qi = GET_LOC_LIST(curwin);
 	if (qi == NULL)
 	    return;
 }
+qfl = &qi->qf_lists[qi->qf_curlist];
 // Look for an existing quickfix window.
 win = qf_find_win(qi);
 // If a quickfix window is open but we have no errors to display,
 // close the window.  If a quickfix window is not open, then open
 // it if we have errors; otherwise, leave it closed.
 if (qf_stack_empty(qi)
-	    || qi->qf_lists[qi->qf_curlist].qf_nonevalid
+	    || qfl->qf_nonevalid
 	    || qf_list_empty(qi, qi->qf_curlist))
 {
 	if (win != NULL)
 	    ex_cclose(eap);
 }
 */
 void
 ex_copen(exarg_T *eap)
 {
 qf_info_T	*qi = &ql_info;
+qf_list_T	*qfl;
 int		height;
 int		status = FAIL;
 if (is_loclist_cmd(eap->cmdidx))
 {
 						cmdmod.split & WSP_VERT);
 if (status == FAIL)
 	if (qf_open_new_cwindow(qi, height) == FAIL)
 	    return;
-qf_set_title_var(&qi->qf_lists[qi->qf_curlist]);
+qfl = &qi->qf_lists[qi->qf_curlist];
+qf_set_title_var(qfl);
 // Fill the buffer with the quickfix list.
 qf_fill_buffer(qi, curbuf, NULL);
-curwin->w_cursor.lnum = qi->qf_lists[qi->qf_curlist].qf_index;
+curwin->w_cursor.lnum = qfl->qf_index;
 curwin->w_cursor.col = 0;
 check_cursor();
 update_topline();		// scroll to show the line
 }
 }
 // Check if there is anything to display
 if (!qf_stack_empty(qi))
 {
-	char_u	dirname[MAXPATHL];
+	qf_list_T	*qfl = &qi->qf_lists[qi->qf_curlist];
+	char_u		dirname[MAXPATHL];
 	*dirname = NUL;
 	// Add one line for each error
 	if (old_last == NULL)
 	{
-	    qfp = qi->qf_lists[qi->qf_curlist].qf_start;
+	    qfp = qfl->qf_start;
 	    lnum = 0;
 	}
 	else
 	{
 	    qfp = old_last->qf_next;
 	    lnum = buf->b_ml.ml_line_count;
 	}
-	while (lnum < qi->qf_lists[qi->qf_curlist].qf_count)
+	while (lnum < qfl->qf_count)
 	{
 	    if (qf_buf_add_line(buf, lnum, qfp, dirname) == FAIL)
 		break;
 	    ++lnum;
 /*
 * For every change made to the quickfix list, update the changed tick.
 */
 static void
-qf_list_changed(qf_info_T *qi, int qf_idx)
+qf_list_changed(qf_list_T *qfl)
 {
-qi->qf_lists[qf_idx].qf_changedtick++;
+qfl->qf_changedtick++;
 }
 /*
 * Return the quickfix/location list number with the given identifier.
 * Returns -1 if list is not found.
 	qi = GET_LOC_LIST(wp);
 	if (qi == NULL)
 	    goto cleanup;
 }
 if (res >= 0)
-	qf_list_changed(qi, qi->qf_curlist);
+	qf_list_changed(&qi->qf_lists[qi->qf_curlist]);
 // Remember the current quickfix list identifier, so that we can
 // check for autocommands changing the current quickfix list.
 save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
 if (au_name != NULL)
 */
 int
 qf_get_size(exarg_T *eap)
 {
 qf_info_T	*qi = &ql_info;
+qf_list_T	*qfl;
 qfline_T	*qfp;
 int		i, sz = 0;
 int		prev_fnum = 0;
 if (is_loclist_cmd(eap->cmdidx))
 	qi = GET_LOC_LIST(curwin);
 	if (qi == NULL)
 	    return 0;
 }
-for (i = 0, qfp = qi->qf_lists[qi->qf_curlist].qf_start;
+qfl = &qi->qf_lists[qi->qf_curlist];
-	    i < qi->qf_lists[qi->qf_curlist].qf_count && qfp != NULL;
+for (i = 0, qfp = qfl->qf_start; i < qfl->qf_count && qfp != NULL;
 	    ++i, qfp = qfp->qf_next)
 {
 	if (qfp->qf_valid)
 	{
 	    if (eap->cmdidx == CMD_cdo || eap->cmdidx == CMD_ldo)
 	qi = GET_LOC_LIST(wp);
 	if (qi == NULL)
 	    return;
 }
 if (res >= 0)
-	qf_list_changed(qi, qi->qf_curlist);
+	qf_list_changed(&qi->qf_lists[qi->qf_curlist]);
 save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
 if (au_name != NULL)
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, NULL, FALSE, curbuf);
 // Jump to the first error for a new list and if autocmds didn't
 char_u	*title;
 char_u	*s;
 char_u	*p;
 int		fi;
 qf_info_T	*qi = &ql_info;
+qf_list_T	*qfl;
 int_u	save_qfid;
 win_T	*wp = NULL;
 buf_T	*buf;
 int		duplicate_name = FALSE;
 int		using_dummy;
 	}
 }
 FreeWild(fcount, fnames);
-qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE;
+qfl = &qi->qf_lists[qi->qf_curlist];
-qi->qf_lists[qi->qf_curlist].qf_ptr = qi->qf_lists[qi->qf_curlist].qf_start;
+qfl->qf_nonevalid = FALSE;
-qi->qf_lists[qi->qf_curlist].qf_index = 1;
+qfl->qf_ptr = qfl->qf_start;
-qf_list_changed(qi, qi->qf_curlist);
+qfl->qf_index = 1;
+qf_list_changed(qfl);
 qf_update_buffer(qi, NULL);
 if (au_name != NULL)
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 	status = dict_add_number(retdict, "idx", 0);
 if ((status == OK) && (flags & QF_GETLIST_SIZE))
 	status = dict_add_number(retdict, "size", 0);
 if ((status == OK) && (flags & QF_GETLIST_TICK))
 	status = dict_add_number(retdict, "changedtick", 0);
-if ((status == OK) && (qi != &ql_info) && (flags & QF_GETLIST_FILEWINID))
+if ((status == OK) && IS_LL_STACK(qi) && (flags & QF_GETLIST_FILEWINID))
 	status = dict_add_number(retdict, "filewinid", 0);
 return status;
 }
 /*
 * Return the quickfix list title as 'title' in retdict
 */
 static int
-qf_getprop_title(qf_info_T *qi, int qf_idx, dict_T *retdict)
+qf_getprop_title(qf_list_T *qfl, dict_T *retdict)
 {
-return dict_add_string(retdict, "title", qi->qf_lists[qf_idx].qf_title);
+return dict_add_string(retdict, "title", qfl->qf_title);
 }
 /*
 * Returns the identifier of the window used to display files from a location
 * list.  If there is no associated window, then returns 0. Useful only when
 /*
 * Return the quickfix list context (if any) as 'context' in retdict.
 */
 static int
-qf_getprop_ctx(qf_info_T *qi, int qf_idx, dict_T *retdict)
+qf_getprop_ctx(qf_list_T *qfl, dict_T *retdict)
 {
 int		status;
 dictitem_T	*di;
-if (qi->qf_lists[qf_idx].qf_ctx != NULL)
+if (qfl->qf_ctx != NULL)
 {
 	di = dictitem_alloc((char_u *)"context");
 	if (di != NULL)
 	{
-	    copy_tv(qi->qf_lists[qf_idx].qf_ctx, &di->di_tv);
+	    copy_tv(qfl->qf_ctx, &di->di_tv);
 	    status = dict_add(retdict, di);
 	    if (status == FAIL)
 		dictitem_free(di);
 	}
 	else
 return status;
 }
 /*
-* Return the quickfix list index as 'idx' in retdict
+* Return the current quickfix list index as 'idx' in retdict
 */
 static int
 qf_getprop_idx(qf_info_T *qi, int qf_idx, dict_T *retdict)
 {
-int idx = qi->qf_lists[qf_idx].qf_index;
+int curidx = qi->qf_lists[qf_idx].qf_index;
 if (qf_list_empty(qi, qf_idx))
-	// For empty lists, qf_index is set to 1
+	// For empty lists, current index is set to 0
-	idx = 0;
+	curidx = 0;
-return dict_add_number(retdict, "idx", idx);
+return dict_add_number(retdict, "idx", curidx);
 }
 /*
 * Return quickfix/location list details (title) as a
 * dictionary. 'what' contains the details to return. If 'list_idx' is -1,
 qf_get_properties(win_T *wp, dict_T *what, dict_T *retdict)
 {
 qf_info_T	*qi = &ql_info;
 qf_list_T	*qfl;
 int		status = OK;
-int		qf_idx;
+int		qf_idx = INVALID_QFIDX;
 dictitem_T	*di;
 int		flags = QF_GETLIST_NONE;
 if ((di = dict_find(what, (char_u *)"lines", -1)) != NULL)
 	return qf_get_list_from_lines(what, di, retdict);
 	return qf_getprop_defaults(qi, flags, retdict);
 qfl = &qi->qf_lists[qf_idx];
 if (flags & QF_GETLIST_TITLE)
-	status = qf_getprop_title(qi, qf_idx, retdict);
+	status = qf_getprop_title(qfl, retdict);
 if ((status == OK) && (flags & QF_GETLIST_NR))
 	status = dict_add_number(retdict, "nr", qf_idx + 1);
 if ((status == OK) && (flags & QF_GETLIST_WINID))
 	status = dict_add_number(retdict, "winid", qf_winid(qi));
 if ((status == OK) && (flags & QF_GETLIST_ITEMS))
 	status = qf_getprop_items(qi, qf_idx, retdict);
 if ((status == OK) && (flags & QF_GETLIST_CONTEXT))
-	status = qf_getprop_ctx(qi, qf_idx, retdict);
+	status = qf_getprop_ctx(qfl, retdict);
 if ((status == OK) && (flags & QF_GETLIST_ID))
 	status = dict_add_number(retdict, "id", qfl->qf_id);
 if ((status == OK) && (flags & QF_GETLIST_IDX))
 	status = qf_getprop_idx(qi, qf_idx, retdict);
 if ((status == OK) && (flags & QF_GETLIST_SIZE))
 * Set the quickfix list title.
 */
 static int
 qf_setprop_title(qf_info_T *qi, int qf_idx, dict_T *what, dictitem_T *di)
 {
+qf_list_T	*qfl = &qi->qf_lists[qf_idx];
 if (di->di_tv.v_type != VAR_STRING)
 	return FAIL;
-vim_free(qi->qf_lists[qf_idx].qf_title);
+vim_free(qfl->qf_title);
-qi->qf_lists[qf_idx].qf_title =
+qfl->qf_title = get_dict_string(what, (char_u *)"title", TRUE);
-	get_dict_string(what, (char_u *)"title", TRUE);
 if (qf_idx == qi->qf_curlist)
 	qf_update_win_titlevar(qi);
 return OK;
 }
 {
 dictitem_T	*di;
 int		retval = FAIL;
 int		qf_idx;
 int		newlist = FALSE;
+qf_list_T	*qfl;
 if (action == ' ' || qf_stack_empty(qi))
 	newlist = TRUE;
 qf_idx = qf_setprop_get_qfidx(qi, what, action, &newlist);
 	qi->qf_curlist = qf_idx;
 	qf_new_list(qi, title);
 	qf_idx = qi->qf_curlist;
 }
+qfl = &qi->qf_lists[qf_idx];
 if ((di = dict_find(what, (char_u *)"title", -1)) != NULL)
 	retval = qf_setprop_title(qi, qf_idx, what, di);
 if ((di = dict_find(what, (char_u *)"items", -1)) != NULL)
 	retval = qf_setprop_items(qi, qf_idx, di, action);
 if ((di = dict_find(what, (char_u *)"lines", -1)) != NULL)
 	retval = qf_setprop_items_from_lines(qi, qf_idx, what, di, action);
 if ((di = dict_find(what, (char_u *)"context", -1)) != NULL)
-	retval = qf_setprop_context(&qi->qf_lists[qf_idx], di);
+	retval = qf_setprop_context(qfl, di);
 if (retval == OK)
-	qf_list_changed(qi, qf_idx);
+	qf_list_changed(qfl);
 return retval;
 }
 /*
-* Find the non-location list window with the specified location list in the
+* Find the non-location list window with the specified location list stack in
-* current tabpage.
+* the current tabpage.
 */
 static win_T *
 find_win_with_ll(qf_info_T *qi)
 {
 win_T	*wp = NULL;
 	retval = qf_set_properties(qi, what, action, title);
 else
 {
 	retval = qf_add_entries(qi, qi->qf_curlist, list, title, action);
 	if (retval == OK)
-	    qf_list_changed(qi, qi->qf_curlist);
+	    qf_list_changed(&qi->qf_lists[qi->qf_curlist]);
 }
 return retval;
 }
 			    (eap->cmdidx != CMD_caddbuffer
 			     && eap->cmdidx != CMD_laddbuffer),
 						   eap->line1, eap->line2,
 						   qf_title, NULL);
 	    if (res >= 0)
-		qf_list_changed(qi, qi->qf_curlist);
+		qf_list_changed(&qi->qf_lists[qi->qf_curlist]);
 	    // Remember the current quickfix list identifier, so that we can
 	    // check for autocommands changing the current quickfix list.
 	    save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
 	    if (au_name != NULL)
 			    (eap->cmdidx != CMD_caddexpr
 			     && eap->cmdidx != CMD_laddexpr),
 				 (linenr_T)0, (linenr_T)0,
 				 qf_cmdtitle(*eap->cmdlinep), NULL);
 	    if (res >= 0)
-		qf_list_changed(qi, qi->qf_curlist);
+		qf_list_changed(&qi->qf_lists[qi->qf_curlist]);
 	    // Remember the current quickfix list identifier, so that we can
 	    // check for autocommands changing the current quickfix list.
 	    save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
 	    if (au_name != NULL)
 #endif
 regmatch.regprog = vim_regcomp(eap->arg, RE_MAGIC + RE_STRING);
 regmatch.rm_ic = FALSE;
 if (regmatch.regprog != NULL)
 {
+	qf_list_T	*qfl;
 	// create a new quickfix list
 	qf_new_list(qi, qf_cmdtitle(*eap->cmdlinep));
 	hgr_search_in_rtp(qi, &regmatch, lang);
 	vim_regfree(regmatch.regprog);
-	qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE;
+	qfl = &qi->qf_lists[qi->qf_curlist];
-	qi->qf_lists[qi->qf_curlist].qf_ptr =
+	qfl->qf_nonevalid = FALSE;
-	    qi->qf_lists[qi->qf_curlist].qf_start;
+	qfl->qf_ptr = qfl->qf_start;
-	qi->qf_lists[qi->qf_curlist].qf_index = 1;
+	qfl->qf_index = 1;
+	qf_list_changed(qfl);
+	qf_update_buffer(qi, NULL);
 }
 if (p_cpo == empty_option)
 	p_cpo = save_cpo;
 else
 	// Darn, some plugin changed the value.
 	free_string_option(save_cpo);
-qf_list_changed(qi, qi->qf_curlist);
-qf_update_buffer(qi, NULL);
 if (au_name != NULL)
 {
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 					       curbuf->b_fname, TRUE, curbuf);
 	if (!new_qi && IS_LL_STACK(qi) && qf_find_buf(qi) == NULL)

Mercurial > vim

comparison src/quickfix.c @ 14915:f508bb2fb808 v8.1.0469