comparison mercurial/parsers.c @ 26054:5049e10fed14

reachableroots: use internal "revstates" array to test if rev is reachable

This is faster than using PySet_Contains().

  revset #0: 0::tip
  1) 0.003678
  2) 0.002536  68%

26053:b68c9d232db6

	/* Internal data structure:
	 * tovisit: array of length len+1 (all revs + nullrev), filled upto lentovisit
	 * revstates: array of length len+1 (all revs + nullrev) */
	int *tovisit = NULL;
	long lentovisit = 0;
	enum { RS_SEEN = 1, RS_ROOT = 2 };
	char *revstates = NULL;

	/* Get arguments */
	if (!PyArg_ParseTuple(args, "lO!O!O!", &minroot, &PyList_Type, &heads,
			      &PyList_Type, &roots,

	k = 0;
	while (k < lentovisit) {
		/* Add the node to reachable if it is a root*/
		revnum = tovisit[k++];
		if (revstates[revnum + 1] & RS_ROOT) {
			val = PyInt_FromLong(revnum);
			if (val == NULL)
				goto bail;
			PySet_Add(reachable, val);
			Py_DECREF(val);

			/* Corrupted index file, error is set from
			 * index_get_parents */
			if (r < 0)
				goto bail;
			for (k = 0; k < 2; k++) {
				PyObject *p = PyInt_FromLong(parents[k]);
				if (p == NULL)
					goto bail;
				if (PySet_Contains(reachable, p) == 1) {
					val = PyInt_FromLong(i);
					if (val == NULL)
						goto bail;
					PySet_Add(reachable, val);
					Py_DECREF(val);
				}
				Py_DECREF(p);
			}
		}
	}

	free(revstates);

26054:5049e10fed14

	/* Internal data structure:
	 * tovisit: array of length len+1 (all revs + nullrev), filled upto lentovisit
	 * revstates: array of length len+1 (all revs + nullrev) */
	int *tovisit = NULL;
	long lentovisit = 0;
	enum { RS_SEEN = 1, RS_ROOT = 2, RS_REACHABLE = 4 };
	char *revstates = NULL;

	/* Get arguments */
	if (!PyArg_ParseTuple(args, "lO!O!O!", &minroot, &PyList_Type, &heads,
			      &PyList_Type, &roots,

	k = 0;
	while (k < lentovisit) {
		/* Add the node to reachable if it is a root*/
		revnum = tovisit[k++];
		if (revstates[revnum + 1] & RS_ROOT) {
			revstates[revnum + 1] |= RS_REACHABLE;
			val = PyInt_FromLong(revnum);
			if (val == NULL)
				goto bail;
			PySet_Add(reachable, val);
			Py_DECREF(val);

			/* Corrupted index file, error is set from
			 * index_get_parents */
			if (r < 0)
				goto bail;
			for (k = 0; k < 2; k++) {
				if (revstates[parents[k] + 1] & RS_REACHABLE) {
					revstates[i + 1] |= RS_REACHABLE;
					val = PyInt_FromLong(i);
					if (val == NULL)
						goto bail;
					PySet_Add(reachable, val);
					Py_DECREF(val);
				}
			}
		}
	}

	free(revstates);