Commit cbae73e1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

llist: no longer uses malloc 

The 'list element' struct now has to be within the data that is being
added to the list. Removes 16.6% (tiny) mallocs from a simple HTTP
transfer. (96 => 80)

Also removed return codes since the llist functions can't fail now.

Test 1300 updated accordingly.

Closes #1435
parent cbb59ed9

lib/conncache.c

+3 −5
Original line number Diff line number Diff line
@@ -74,11 +74,9 @@ static void bundle_destroy(struct connectbundle *cb_ptr) 
static CURLcode bundle_add_conn(struct connectbundle *cb_ptr,

                                struct connectdata *conn)

{

  if(!Curl_llist_insert_next(&cb_ptr->conn_list, cb_ptr->conn_list.tail, conn))

    return CURLE_OUT_OF_MEMORY;



  Curl_llist_insert_next(&cb_ptr->conn_list, cb_ptr->conn_list.tail, conn,

                         &conn->bundle_node);

  conn->bundle = cb_ptr;



  cb_ptr->num_connections++;

  return CURLE_OK;

}

lib/fileinfo.c

+5 −9
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2010 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 2010 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -28,23 +28,19 @@ 
/* The last #include file should be: */

#include "memdebug.h"



struct curl_fileinfo *Curl_fileinfo_alloc(void)

struct fileinfo *Curl_fileinfo_alloc(void)

{

  struct curl_fileinfo *tmp = malloc(sizeof(struct curl_fileinfo));

  if(!tmp)

    return NULL;

  memset(tmp, 0, sizeof(struct curl_fileinfo));

  return tmp;

  return calloc(1, sizeof(struct fileinfo));

}



void Curl_fileinfo_dtor(void *user, void *element)

{

  struct curl_fileinfo *finfo = element;

  struct fileinfo *finfo = element;

  (void) user;

  if(!finfo)

    return;



  Curl_safefree(finfo->b_data);

  Curl_safefree(finfo->info.b_data);



  free(finfo);

}

lib/fileinfo.h

+8 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 2010, 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -23,11 +23,15 @@ 
 ***************************************************************************/



#include <curl/curl.h>

#include "llist.h"



struct curl_fileinfo *Curl_fileinfo_alloc(void);

struct fileinfo {

  struct curl_fileinfo info;

  struct curl_llist_element list;

};



void Curl_fileinfo_dtor(void *, void *);

struct fileinfo *Curl_fileinfo_alloc(void);



struct curl_fileinfo *Curl_fileinfo_dup(const struct curl_fileinfo *src);

void Curl_fileinfo_dtor(void *, void *);



#endif /* HEADER_CURL_FILEINFO_H */

lib/ftplistparser.c

+24 −25
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct ftp_parselist_data { 
  } state;



  CURLcode error;

  struct curl_fileinfo *file_data;

  struct fileinfo *file_data;

  unsigned int item_length;

  size_t item_offset;

  struct {
@@ -275,7 +275,7 @@ static void PL_ERROR(struct connectdata *conn, CURLcode err) 
}



static CURLcode ftp_pl_insert_finfo(struct connectdata *conn,

                                    struct curl_fileinfo *finfo)

                                    struct fileinfo *infop)

{

  curl_fnmatch_callback compare;

  struct WildcardData *wc = &conn->data->wildcard;
@@ -283,6 +283,7 @@ static CURLcode ftp_pl_insert_finfo(struct connectdata *conn, 
  struct curl_llist *llist = &wc->filelist;

  struct ftp_parselist_data *parser = tmpdata->parser;

  bool add = TRUE;

  struct curl_fileinfo *finfo = &infop->info;



  /* move finfo pointers to b_data */

  char *str = finfo->b_data;
@@ -316,11 +317,7 @@ static CURLcode ftp_pl_insert_finfo(struct connectdata *conn, 
  }



  if(add) {

    if(!Curl_llist_insert_next(llist, llist->tail, finfo)) {

      Curl_fileinfo_dtor(NULL, finfo);

      tmpdata->parser->file_data = NULL;

      return CURLE_OUT_OF_MEMORY;

    }

    Curl_llist_insert_next(llist, llist->tail, finfo, &infop->list);

  }

  else {

    Curl_fileinfo_dtor(NULL, finfo);
@@ -337,6 +334,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
  struct connectdata *conn = (struct connectdata *)connptr;

  struct ftp_wc_tmpdata *tmpdata = conn->data->wildcard.tmp;

  struct ftp_parselist_data *parser = tmpdata->parser;

  struct fileinfo *infop;

  struct curl_fileinfo *finfo;

  unsigned long i = 0;

  CURLcode result;
@@ -366,17 +364,18 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
        parser->error = CURLE_OUT_OF_MEMORY;

        return bufflen;

      }

      parser->file_data->b_data = malloc(FTP_BUFFER_ALLOCSIZE);

      if(!parser->file_data->b_data) {

      parser->file_data->info.b_data = malloc(FTP_BUFFER_ALLOCSIZE);

      if(!parser->file_data->info.b_data) {

        PL_ERROR(conn, CURLE_OUT_OF_MEMORY);

        return bufflen;

      }

      parser->file_data->b_size = FTP_BUFFER_ALLOCSIZE;

      parser->file_data->info.b_size = FTP_BUFFER_ALLOCSIZE;

      parser->item_offset = 0;

      parser->item_length = 0;

    }



    finfo = parser->file_data;

    infop = parser->file_data;

    finfo = &infop->info;

    finfo->b_data[finfo->b_used++] = c;



    if(finfo->b_used >= finfo->b_size - 1) {
@@ -498,8 +497,8 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
            PL_ERROR(conn, CURLE_FTP_BAD_FILE_LIST);

            return bufflen;

          }

          parser->file_data->flags |= CURLFINFOFLAG_KNOWN_PERM;

          parser->file_data->perm = perm;

          parser->file_data->info.flags |= CURLFINFOFLAG_KNOWN_PERM;

          parser->file_data->info.perm = perm;

          parser->offsets.perm = parser->item_offset;



          parser->item_length = 0;
@@ -530,8 +529,8 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
            finfo->b_data[parser->item_offset + parser->item_length - 1] = 0;

            hlinks = strtol(finfo->b_data + parser->item_offset, &p, 10);

            if(p[0] == '\0' && hlinks != LONG_MAX && hlinks != LONG_MIN) {

              parser->file_data->flags |= CURLFINFOFLAG_KNOWN_HLINKCOUNT;

              parser->file_data->hardlinks = hlinks;

              parser->file_data->info.flags |= CURLFINFOFLAG_KNOWN_HLINKCOUNT;

              parser->file_data->info.hardlinks = hlinks;

            }

            parser->item_length = 0;

            parser->item_offset = 0;
@@ -613,8 +612,8 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
            fsize = curlx_strtoofft(finfo->b_data+parser->item_offset, &p, 10);

            if(p[0] == '\0' && fsize != CURL_OFF_T_MAX &&

                               fsize != CURL_OFF_T_MIN) {

              parser->file_data->flags |= CURLFINFOFLAG_KNOWN_SIZE;

              parser->file_data->size = fsize;

              parser->file_data->info.flags |= CURLFINFOFLAG_KNOWN_SIZE;

              parser->file_data->info.size = fsize;

            }

            parser->item_length = 0;

            parser->item_offset = 0;
@@ -731,7 +730,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
            finfo->b_data[parser->item_offset + parser->item_length - 1] = 0;

            parser->offsets.filename = parser->item_offset;

            parser->state.UNIX.main = PL_UNIX_FILETYPE;

            result = ftp_pl_insert_finfo(conn, finfo);

            result = ftp_pl_insert_finfo(conn, infop);

            if(result) {

              PL_ERROR(conn, result);

              return bufflen;
@@ -743,7 +742,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
            finfo->b_data[parser->item_offset + parser->item_length - 1] = 0;

            parser->offsets.filename = parser->item_offset;

            parser->state.UNIX.main = PL_UNIX_FILETYPE;

            result = ftp_pl_insert_finfo(conn, finfo);

            result = ftp_pl_insert_finfo(conn, infop);

            if(result) {

              PL_ERROR(conn, result);

              return bufflen;
@@ -838,7 +837,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
          else if(c == '\n') {

            finfo->b_data[parser->item_offset + parser->item_length - 1] = 0;

            parser->offsets.symlink_target = parser->item_offset;

            result = ftp_pl_insert_finfo(conn, finfo);

            result = ftp_pl_insert_finfo(conn, infop);

            if(result) {

              PL_ERROR(conn, result);

              return bufflen;
@@ -850,7 +849,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
          if(c == '\n') {

            finfo->b_data[parser->item_offset + parser->item_length - 1] = 0;

            parser->offsets.symlink_target = parser->item_offset;

            result = ftp_pl_insert_finfo(conn, finfo);

            result = ftp_pl_insert_finfo(conn, infop);

            if(result) {

              PL_ERROR(conn, result);

              return bufflen;
@@ -953,10 +952,10 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
                return bufflen;

              }

              /* correct file type */

              parser->file_data->filetype = CURLFILETYPE_FILE;

              parser->file_data->info.filetype = CURLFILETYPE_FILE;

            }



            parser->file_data->flags |= CURLFINFOFLAG_KNOWN_SIZE;

            parser->file_data->info.flags |= CURLFINFOFLAG_KNOWN_SIZE;

            parser->item_length = 0;

            parser->state.NT.main = PL_WINNT_FILENAME;

            parser->state.NT.sub.filename = PL_WINNT_FILENAME_PRESPACE;
@@ -983,7 +982,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
            parser->offsets.filename = parser->item_offset;

            finfo->b_data[finfo->b_used - 1] = 0;

            parser->offsets.filename = parser->item_offset;

            result = ftp_pl_insert_finfo(conn, finfo);

            result = ftp_pl_insert_finfo(conn, infop);

            if(result) {

              PL_ERROR(conn, result);

              return bufflen;
@@ -995,7 +994,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, 
        case PL_WINNT_FILENAME_WINEOL:

          if(c == '\n') {

            parser->offsets.filename = parser->item_offset;

            result = ftp_pl_insert_finfo(conn, finfo);

            result = ftp_pl_insert_finfo(conn, infop);

            if(result) {

              PL_ERROR(conn, result);

              return bufflen;

lib/hash.c

+3 −11
Original line number Diff line number Diff line
@@ -124,18 +124,10 @@ Curl_hash_add(struct curl_hash *h, void *key, size_t key_len, void *p) 


  he = mk_hash_element(key, key_len, p);

  if(he) {

    if(Curl_llist_insert_next(l, l->tail, he)) {

    Curl_llist_insert_next(l, l->tail, he, &he->list);

    ++h->size;

    return p; /* return the new entry */

  }

    /*

     * Couldn't insert it, destroy the 'he' element and the key again. We

     * don't call hash_element_dtor() since that would also call the

     * "destructor" for the actual data 'p'. When we fail, we shall not touch

     * that data.

     */

    free(he);

  }



  return NULL; /* failure */

}