Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge trunk |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | novem |
| Files: | files | file ages | folders |
| SHA1: |
96aa9dc40d93dba287817528ddae4d62 |
| User & Date: | dgp 2015-11-30 20:24:27 |
Context
|
2015-12-11
| ||
| 10:19 | merge trunk check-in: 3da32b644c user: jan.nijtmans tags: novem | |
|
2015-11-30
| ||
| 20:45 | merge novem check-in: 11442a0d95 user: dgp tags: dgp-refactor | |
| 20:24 | merge trunk check-in: 96aa9dc40d user: dgp tags: novem | |
| 18:24 | [32c5740a4d] Have Tcl_ListObjReplace() try to use realloc() for growing when it can do so. check-in: a467b03d94 user: dgp tags: trunk | |
|
2015-11-26
| ||
| 12:04 | merge trunk check-in: c6eb9d67c7 user: jan.nijtmans tags: novem | |
Changes
Changes to generic/tclListObj.c.
| ︙ | ︙ | |||
853 854 855 856 857 858 859 |
int count, /* Number of elements to replace. */
int objc, /* Number of objects to insert. */
Tcl_Obj *const objv[]) /* An array of objc pointers to Tcl objects to
* insert. */
{
List *listRepPtr;
register Tcl_Obj **elemPtrs;
| | | 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 |
int count, /* Number of elements to replace. */
int objc, /* Number of objects to insert. */
Tcl_Obj *const objv[]) /* An array of objc pointers to Tcl objects to
* insert. */
{
List *listRepPtr;
register Tcl_Obj **elemPtrs;
int needGrow, numElems, numRequired, numAfterLast, start, i, j, isShared;
if (Tcl_IsShared(listPtr)) {
Tcl_Panic("%s called with shared object", "Tcl_ListObjReplace");
}
if (listPtr->typePtr != &tclListType) {
if (listPtr->bytes == tclEmptyStringRep) {
if (!objc) {
|
| ︙ | ︙ | |||
909 910 911 912 913 914 915 916 917 918 919 920 |
if (objc > LIST_MAX - (numElems - count)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"max length of a Tcl list (%d elements) exceeded", LIST_MAX));
return TCL_ERROR;
}
isShared = (listRepPtr->refCount > 1);
numRequired = numElems - count + objc; /* Known <= LIST_MAX */
for (i = 0; i < objc; i++) {
Tcl_IncrRefCount(objv[i]);
}
| > > > > > > > > > > > > > > > > > > > > > > > | > > > > | 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 |
if (objc > LIST_MAX - (numElems - count)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"max length of a Tcl list (%d elements) exceeded", LIST_MAX));
return TCL_ERROR;
}
isShared = (listRepPtr->refCount > 1);
numRequired = numElems - count + objc; /* Known <= LIST_MAX */
needGrow = numRequired > listRepPtr->maxElemCount;
for (i = 0; i < objc; i++) {
Tcl_IncrRefCount(objv[i]);
}
if (needGrow && !isShared) {
/* Try to use realloc */
List *newPtr = NULL;
int attempt = 2 * numRequired;
if (attempt <= LIST_MAX) {
newPtr = attemptckrealloc(listRepPtr, LIST_SIZE(attempt));
}
if (newPtr == NULL) {
attempt = numRequired + 1 + TCL_MIN_ELEMENT_GROWTH;
if (attempt > LIST_MAX) {
attempt = LIST_MAX;
}
newPtr = attemptckrealloc(listRepPtr, LIST_SIZE(attempt));
}
if (newPtr == NULL) {
attempt = numRequired;
newPtr = attemptckrealloc(listRepPtr, LIST_SIZE(attempt));
}
if (newPtr) {
listRepPtr = newPtr;
listPtr->internalRep.twoPtrValue.ptr1 = listRepPtr;
elemPtrs = &listRepPtr->elements;
listRepPtr->maxElemCount = attempt;
needGrow = numRequired > listRepPtr->maxElemCount;
}
}
if (!needGrow && !isShared) {
int shift;
/*
* Can use the current List struct. First "delete" count elements
* starting at first.
*/
|
| ︙ | ︙ | |||
951 952 953 954 955 956 957 | * both. Allocate a new struct and insert elements into it. */ List *oldListRepPtr = listRepPtr; Tcl_Obj **oldPtrs = elemPtrs; int newMax; | | | 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 |
* both. Allocate a new struct and insert elements into it.
*/
List *oldListRepPtr = listRepPtr;
Tcl_Obj **oldPtrs = elemPtrs;
int newMax;
if (needGrow){
newMax = 2 * numRequired;
} else {
newMax = listRepPtr->maxElemCount;
}
listRepPtr = AttemptNewList(NULL, newMax, NULL);
if (listRepPtr == NULL) {
|
| ︙ | ︙ |