Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/4b4ec5b4d21b77590f4adf2dd76fdf88ca1e8485
...commit
http://git.netsurf-browser.org/netsurf.git/commit/4b4ec5b4d21b77590f4adf2dd76fdf88ca1e8485
...tree
http://git.netsurf-browser.org/netsurf.git/tree/4b4ec5b4d21b77590f4adf2dd76fdf88ca1e8485
The branch, chris/debug has been updated
discards bc6deb1adf2b05a102247cd81a6f2ea12dc7cabd (commit)
discards d13c920e07f819b484139145c196609a8f0a2d18 (commit)
discards e36c78074799920d38564100b76817f7ea7d2f8c (commit)
discards dd1b2bb2b0953efda49757f32e7baf559ad6438c (commit)
discards 25237f93db0fb5e393145aa815dc95a7988db29b (commit)
via 4b4ec5b4d21b77590f4adf2dd76fdf88ca1e8485 (commit)
via b5c2f8bb9e2e272f259b09b7dbb20dfebfdc794c (commit)
via 0278cf48770b34de9726a2517adec22bd35faf50 (commit)
via 87b34e1ddd22cf575c994ab04c2185f3cab6a9f6 (commit)
via 4134d4cbd67ab734ab1703489cca47d39a7e9864 (commit)
via 1a235de6628693b18e1b2e9a5ed1d4154d2fe749 (commit)
via 7314651b9506d9810ce15c45811894e4e6a89107 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (bc6deb1adf2b05a102247cd81a6f2ea12dc7cabd)
\
N -- N -- N (4b4ec5b4d21b77590f4adf2dd76fdf88ca1e8485)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=4b4ec5b4d21b77590f4adf2dd76fdf88ca1e8485
commit 4b4ec5b4d21b77590f4adf2dd76fdf88ca1e8485
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Correct memory pool allocs with the ones from master
diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h
index 93201a2..a9a882e 100644
--- a/frontends/amiga/memory.h
+++ b/frontends/amiga/memory.h
@@ -51,10 +51,10 @@ void *ami_memory_clear_alloc(size_t size, UBYTE value);
#define ami_memory_itempool_alloc(p,s) ItemPoolAlloc(p)
#define ami_memory_itempool_free(p,i,s) ItemPoolFree(p,i)
#else
-#define ami_memory_itempool_create(s) (NULL)
+#define ami_memory_itempool_create(s) ((APTR)1)
#define ami_memory_itempool_delete(p) ((void)0)
#define ami_memory_itempool_alloc(p,s) malloc(s)
-#define ami_memory_itempool_free(p,i,s) free(p)
+#define ami_memory_itempool_free(p,i,s) free(i)
#endif
/* clib2 slab allocator */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=b5c2f8bb9e2e272f259b09b7dbb20dfebfdc794c
commit b5c2f8bb9e2e272f259b09b7dbb20dfebfdc794c
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Revert "Ensure we free the pen list memory"
This reverts commit 74d7c2d2c2b2161701c1f0258bbfc7feb753ac1e.
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index b6add47..f06f911 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -354,6 +354,7 @@ void ami_plot_release_pens(struct MinList *shared_pens)
Remove((struct Node *)node);
ami_memory_itempool_free(pool_pens, node, sizeof(struct
ami_plot_pen));
} while((node = nnode));
+
}
static void ami_plot_setapen(struct gui_globals *glob, struct RastPort *rp,
ULONG colr)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0278cf48770b34de9726a2517adec22bd35faf50
commit 0278cf48770b34de9726a2517adec22bd35faf50
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Replace custom itempool functions with malloc/free as clib handles these
more efficiently than our pools.
diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h
index a9a882e..93201a2 100644
--- a/frontends/amiga/memory.h
+++ b/frontends/amiga/memory.h
@@ -51,10 +51,10 @@ void *ami_memory_clear_alloc(size_t size, UBYTE value);
#define ami_memory_itempool_alloc(p,s) ItemPoolAlloc(p)
#define ami_memory_itempool_free(p,i,s) ItemPoolFree(p,i)
#else
-#define ami_memory_itempool_create(s) ((APTR)1)
+#define ami_memory_itempool_create(s) (NULL)
#define ami_memory_itempool_delete(p) ((void)0)
#define ami_memory_itempool_alloc(p,s) malloc(s)
-#define ami_memory_itempool_free(p,i,s) free(i)
+#define ami_memory_itempool_free(p,i,s) free(p)
#endif
/* clib2 slab allocator */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=87b34e1ddd22cf575c994ab04c2185f3cab6a9f6
commit 87b34e1ddd22cf575c994ab04c2185f3cab6a9f6
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Modify some "free" references which were failing to build with clib2 debug
mode
diff --git a/content/fetch.c b/content/fetch.c
index 7665029..e6af45a 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -598,7 +598,7 @@ void fetch_free(struct fetch *f)
f,
f->fetcher_handle);
- fetchers[f->fetcherd].ops.free(f->fetcher_handle);
+ fetchers[f->fetcherd].ops.ffree(f->fetcher_handle);
fetch_unref_fetcher(f->fetcherd);
diff --git a/content/fetchers.h b/content/fetchers.h
index 6392e24..36d77c1 100644
--- a/content/fetchers.h
+++ b/content/fetchers.h
@@ -83,7 +83,7 @@ struct fetcher_operation_table {
/**
* free a fetch allocated through the setup method.
*/
- void (*free)(void *fetch);
+ void (*ffree)(void *fetch);
/**
* poll a fetcher to let it make progress.
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
index 4d14020..76985a7 100644
--- a/content/fetchers/about.c
+++ b/content/fetchers/about.c
@@ -853,7 +853,7 @@ nserror fetch_about_register(void)
.setup = fetch_about_setup,
.start = fetch_about_start,
.abort = fetch_about_abort,
- .free = fetch_about_free,
+ .ffree = fetch_about_free,
.poll = fetch_about_poll,
.finalise = fetch_about_finalise
};
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index c039429..e54f863 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -1484,7 +1484,7 @@ nserror fetch_curl_register(void)
.setup = fetch_curl_setup,
.start = fetch_curl_start,
.abort = fetch_curl_abort,
- .free = fetch_curl_free,
+ .ffree = fetch_curl_free,
.poll = fetch_curl_poll,
.fdset = fetch_curl_fdset,
.finalise = fetch_curl_finalise
diff --git a/content/fetchers/data.c b/content/fetchers/data.c
index 8c04bcf..cb7dbdc 100644
--- a/content/fetchers/data.c
+++ b/content/fetchers/data.c
@@ -316,7 +316,7 @@ nserror fetch_data_register(void)
.setup = fetch_data_setup,
.start = fetch_data_start,
.abort = fetch_data_abort,
- .free = fetch_data_free,
+ .ffree = fetch_data_free,
.poll = fetch_data_poll,
.finalise = fetch_data_finalise
};
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index 4fa1a21..52c0263 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -827,7 +827,7 @@ nserror fetch_file_register(void)
.setup = fetch_file_setup,
.start = fetch_file_start,
.abort = fetch_file_abort,
- .free = fetch_file_free,
+ .ffree = fetch_file_free,
.poll = fetch_file_poll,
.finalise = fetch_file_finalise
};
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index 7875773..3177e7c 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -464,7 +464,7 @@ nserror fetch_resource_register(void)
.setup = fetch_resource_setup,
.start = fetch_resource_start,
.abort = fetch_resource_abort,
- .free = fetch_resource_free,
+ .ffree = fetch_resource_free,
.poll = fetch_resource_poll,
.finalise = fetch_resource_finalise
};
diff --git a/content/handlers/html/html_css_fetcher.c
b/content/handlers/html/html_css_fetcher.c
index 7987ea0..cf2aa39 100644
--- a/content/handlers/html/html_css_fetcher.c
+++ b/content/handlers/html/html_css_fetcher.c
@@ -291,7 +291,7 @@ nserror html_css_fetcher_register(void)
.setup = html_css_fetcher_setup,
.start = html_css_fetcher_start,
.abort = html_css_fetcher_abort,
- .free = html_css_fetcher_free,
+ .ffree = html_css_fetcher_free,
.poll = html_css_fetcher_poll,
.finalise = html_css_fetcher_finalise
};
diff --git a/content/handlers/javascript/fetcher.c
b/content/handlers/javascript/fetcher.c
index 839df26..80a53d8 100644
--- a/content/handlers/javascript/fetcher.c
+++ b/content/handlers/javascript/fetcher.c
@@ -208,7 +208,7 @@ nserror fetch_javascript_register(void)
.setup = fetch_javascript_setup,
.start = fetch_javascript_start,
.abort = fetch_javascript_abort,
- .free = fetch_javascript_free,
+ .ffree = fetch_javascript_free,
.poll = fetch_javascript_poll,
.finalise = fetch_javascript_finalise
};
diff --git a/utils/http/generics.c b/utils/http/generics.c
index e0798f9..054446e 100644
--- a/utils/http/generics.c
+++ b/utils/http/generics.c
@@ -33,7 +33,7 @@ void http___item_list_destroy(http__item *list)
list = victim->next;
- victim->free(victim);
+ victim->ffree(victim);
}
}
diff --git a/utils/http/generics.h b/utils/http/generics.h
index a5af734..878627e 100644
--- a/utils/http/generics.h
+++ b/utils/http/generics.h
@@ -29,12 +29,12 @@
typedef struct http__item {
struct http__item *next; /**< Next item in list, or NULL
*/
- void (*free)(struct http__item *self); /**< Item destructor */
+ void (*ffree)(struct http__item *self); /**< Item destructor */
} http__item;
#define HTTP__ITEM_INIT(item, n, f) \
((http__item *) (item))->next = (http__item *) (n); \
- ((http__item *) (item))->free = (void (*)(http__item *)) (f)
+ ((http__item *) (item))->ffree = (void (*)(http__item *)) (f)
/**
* Type of an item parser
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=4134d4cbd67ab734ab1703489cca47d39a7e9864
commit 4134d4cbd67ab734ab1703489cca47d39a7e9864
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Updates to allow clib2 memory debug mode to work
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 6b68072..ca94d88 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -7,7 +7,7 @@ CFLAGS += -std=c99 -Dnsamiga
ifneq ($(SUBTARGET),os3)
CFLAGS += -O2 -mstrict-align -finline-functions -U__STRICT_ANSI__
-D__USE_INLINE__ -D__USE_BASETYPE__
else
- CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020
+ CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020 -D__MEM_DEBUG
endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
@@ -21,14 +21,14 @@ LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
-LDFLAGS += -lpbl -liconv -ldebug
+LDFLAGS += -lpbl -liconv
ifeq ($(NETSURF_USE_OPENSSL),YES)
LDFLAGS += $(shell $(PKG_CONFIG) --static --libs openssl)
endif
ifeq ($(SUBTARGET),os3)
- LDFLAGS += -lamiga -lm
+ LDFLAGS += -lamiga -lm -ldebug
endif
COMMON_WARNFLAGS += -Wno-cast-align
diff --git a/frontends/amiga/memory.c b/frontends/amiga/memory.c
index be74838..2e53c68 100755
--- a/frontends/amiga/memory.c
+++ b/frontends/amiga/memory.c
@@ -167,7 +167,7 @@ struct Interrupt *ami_memory_init(void)
struct Interrupt *memhandler = malloc(sizeof(struct Interrupt));
if(memhandler == NULL) return NULL; // we're screwed
- kprintf("init");
+ kprintf("netsurf init");
memhandler->is_Node.ln_Pri = -127; // low down as will be slow
memhandler->is_Node.ln_Name = "NetSurf low memory handler";
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=1a235de6628693b18e1b2e9a5ed1d4154d2fe749
commit 1a235de6628693b18e1b2e9a5ed1d4154d2fe749
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Enable clib2 debug to work
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 77d2b45..6b68072 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -21,7 +21,7 @@ LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
-LDFLAGS += -lpbl -liconv
+LDFLAGS += -lpbl -liconv -ldebug
ifeq ($(NETSURF_USE_OPENSSL),YES)
LDFLAGS += $(shell $(PKG_CONFIG) --static --libs openssl)
diff --git a/frontends/amiga/memory.c b/frontends/amiga/memory.c
index 35ca969..be74838 100755
--- a/frontends/amiga/memory.c
+++ b/frontends/amiga/memory.c
@@ -167,6 +167,8 @@ struct Interrupt *ami_memory_init(void)
struct Interrupt *memhandler = malloc(sizeof(struct Interrupt));
if(memhandler == NULL) return NULL; // we're screwed
+ kprintf("init");
+
memhandler->is_Node.ln_Pri = -127; // low down as will be slow
memhandler->is_Node.ln_Name = "NetSurf low memory handler";
memhandler->is_Data = NULL;
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/bitmap.c | 1 +
frontends/amiga/memory.h | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 6ad1610..e160f93 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -546,6 +546,7 @@ static inline struct BitMap *ami_bitmap_get_generic(struct
bitmap *bitmap,
DirectDrawTrueColor(ddh, (ULONG
*)amiga_bitmap_get_buffer(bitmap), 0, 0, TAG_DONE);
DeleteDirectDrawHandle(ddh);
ReleaseDrawHandle(bitmap->drawhandle);
+ bitmap->drawhandle = NULL;
}
ami_bitmap_argb_to_rgba(bitmap);
} else {
diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h
index 93201a2..a9a882e 100644
--- a/frontends/amiga/memory.h
+++ b/frontends/amiga/memory.h
@@ -51,10 +51,10 @@ void *ami_memory_clear_alloc(size_t size, UBYTE value);
#define ami_memory_itempool_alloc(p,s) ItemPoolAlloc(p)
#define ami_memory_itempool_free(p,i,s) ItemPoolFree(p,i)
#else
-#define ami_memory_itempool_create(s) (NULL)
+#define ami_memory_itempool_create(s) ((APTR)1)
#define ami_memory_itempool_delete(p) ((void)0)
#define ami_memory_itempool_alloc(p,s) malloc(s)
-#define ami_memory_itempool_free(p,i,s) free(p)
+#define ami_memory_itempool_free(p,i,s) free(i)
#endif
/* clib2 slab allocator */
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
