Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configurable UTSTRING_INITIAL_SIZE #146

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Configurable UTSTRING_INITIAL_SIZE #146

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a71eed
utstring.h: adds the `UTSTRING_INITIAL_SIZE` macro allowing to change…
silvioprog Feb 16, 2018
f1a92f3
utstring.h: applies patch attached to https://github.com/troydhanson/…
silvioprog Feb 16, 2018
4c0ea40
utstring.h: fixes alert "Macro argument should be enclosed in parenth…
silvioprog Feb 16, 2018
b1c4523
Tip from: https://github.com/troydhanson/uthash/pull/146#discussion_r…
silvioprog Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/utstring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define oom() exit(-1)
#endif

#ifndef UTSTRING_INITIAL_SIZE
#define UTSTRING_INITIAL_SIZE 0x64
#endif
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(A) If somebody has a strong use-case for tweaking this specific parameter (UTSTRING_INITIAL_SIZE), then I might be swayed; but a priori, I'd rather see this particular diff come as part of a larger, comprehensive thinking-out of utstring's allocation machinery. Like, maybe it should be using a primitive such as utstring_realloc that the user is allowed to -Define, and maybe we need to think about what realloc-of-size-zero means, and so on.

(B) Writing 0x64 when you mean 100 is just as confusing as writing 0100 when you mean 64. I don't know why you'd do that.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(A) 1. On embedded systems (e.g: an AVR/PIC with just 512 of RAM), the programmer could choose a value smaller than 100; On common fast systems, it can be increased (1 kB, 8 kB) via building system.

(B) Oops, sorry. It was just a habit from microcontroller coding! 😅

Copy link
Author

@silvioprog silvioprog Feb 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(B) additional info: It uses the same concept: https://github.com/troydhanson/libut/blob/master/src/utvector.c#L29 . (however INITIAL_SIZE should be prefixed to UTVECTOR_INITIAL_SIZE avoiding to conflict on user macros)


typedef struct {
char *d; /* pointer to allocated buffer */
size_t n; /* allocated capacity */
Expand All @@ -58,33 +62,33 @@ do { \
(s)->d = utstring_tmp; \
(s)->n += (amt); \
} \
} while(0)
} while (0)

#define utstring_init(s) \
do { \
(s)->n = 0; (s)->i = 0; (s)->d = NULL; \
utstring_reserve(s,100); \
utstring_reserve(s,UTSTRING_INITIAL_SIZE); \
(s)->d[0] = '\0'; \
} while(0)
} while (0)

#define utstring_done(s) \
do { \
if ((s)->d != NULL) free((s)->d); \
(s)->n = 0; \
} while(0)
} while (0)

#define utstring_free(s) \
do { \
utstring_done(s); \
free(s); \
} while(0)
} while (0)

#define utstring_new(s) \
do { \
s = (UT_string*)malloc(sizeof(UT_string)); \
if (!s) oom(); \
(s) = (UT_string*)malloc(sizeof(UT_string)); \
if (!(s)) oom(); \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged as 29fc26a — thanks!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're welcome dude! 👍

utstring_init(s); \
} while(0)
} while (0)

#define utstring_renew(s) \
do { \
Expand All @@ -93,29 +97,29 @@ do { \
} else { \
utstring_new(s); \
} \
} while(0)
} while (0)

#define utstring_clear(s) \
do { \
(s)->i = 0; \
(s)->d[0] = '\0'; \
} while(0)
} while (0)

#define utstring_bincpy(s,b,l) \
do { \
utstring_reserve((s),(l)+1); \
if (l) memcpy(&(s)->d[(s)->i], b, l); \
(s)->i += (l); \
(s)->d[(s)->i]='\0'; \
} while(0)
} while (0)

#define utstring_concat(dst,src) \
do { \
utstring_reserve((dst),((src)->i)+1); \
if ((src)->i) memcpy(&(dst)->d[(dst)->i], (src)->d, (src)->i); \
(dst)->i += (src)->i; \
(dst)->d[(dst)->i]='\0'; \
} while(0)
} while (0)

#define utstring_len(s) ((s)->i)

Expand Down