mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-09 15:29:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pull-211'

Browse Source 
This is EmielBruijntes' "Atomic updates for the refcount"
This commit is contained in:
Eric Haszlakiewicz
2017-09-02 13:54:15 -04:00
parent 95dff31951 7e98ed93f4
commit ab0d4dbc69
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
json_object.c
View File

@@ -163,25 +163,31 @@ static int json_escape_str(struct printbuf *pb, const char *str, int len, int fl
extern struct json_object* json_object_get(struct json_object *jso) extern struct json_object* json_object_get(struct json_object *jso)
{ {
if (jso) if (!jso) return jso;
jso->_ref_count++;
#if defined __GNUC__
__sync_add_and_fetch(&jso->_ref_count, 1);
#else
++jso->_ref_count;
#endif
return jso; return jso;
} }
int json_object_put(struct json_object *jso) int json_object_put(struct json_object *jso)
{ {
if(jso) if(!jso) return 0;
{
jso->_ref_count--; #if defined __GNUC__
if(!jso->_ref_count) if (__sync_sub_and_fetch(&jso->_ref_count, 1) > 0) return 0;
{ #else
if (jso->_user_delete) if (--jso->_ref_count > 0) return 0;
jso->_user_delete(jso, jso->_userdata); #endif
jso->_delete(jso);
return 1; if (jso->_user_delete)
} jso->_user_delete(jso, jso->_userdata);
} jso->_delete(jso);
return 0; return 1;
} }