Revision d0f2c4c6 buffered_file.c

b/buffered_file.c
39 39
} QEMUFileBuffered;
40 40

  
41 41
#ifdef DEBUG_BUFFERED_FILE
42
#define dprintf(fmt, ...) \
42
#define DPRINTF(fmt, ...) \
43 43
    do { printf("buffered-file: " fmt, ## __VA_ARGS__); } while (0)
44 44
#else
45
#define dprintf(fmt, ...) \
45
#define DPRINTF(fmt, ...) \
46 46
    do { } while (0)
47 47
#endif
48 48

  
......
52 52
    if (size > (s->buffer_capacity - s->buffer_size)) {
53 53
        void *tmp;
54 54

  
55
        dprintf("increasing buffer capacity from %zu by %zu\n",
55
        DPRINTF("increasing buffer capacity from %zu by %zu\n",
56 56
                s->buffer_capacity, size + 1024);
57 57

  
58 58
        s->buffer_capacity += size + 1024;
......
75 75
    size_t offset = 0;
76 76

  
77 77
    if (s->has_error) {
78
        dprintf("flush when error, bailing\n");
78
        DPRINTF("flush when error, bailing\n");
79 79
        return;
80 80
    }
81 81

  
82
    dprintf("flushing %zu byte(s) of data\n", s->buffer_size);
82
    DPRINTF("flushing %zu byte(s) of data\n", s->buffer_size);
83 83

  
84 84
    while (offset < s->buffer_size) {
85 85
        ssize_t ret;
......
87 87
        ret = s->put_buffer(s->opaque, s->buffer + offset,
88 88
                            s->buffer_size - offset);
89 89
        if (ret == -EAGAIN) {
90
            dprintf("backend not ready, freezing\n");
90
            DPRINTF("backend not ready, freezing\n");
91 91
            s->freeze_output = 1;
92 92
            break;
93 93
        }
94 94

  
95 95
        if (ret <= 0) {
96
            dprintf("error flushing data, %zd\n", ret);
96
            DPRINTF("error flushing data, %zd\n", ret);
97 97
            s->has_error = 1;
98 98
            break;
99 99
        } else {
100
            dprintf("flushed %zd byte(s)\n", ret);
100
            DPRINTF("flushed %zd byte(s)\n", ret);
101 101
            offset += ret;
102 102
        }
103 103
    }
104 104

  
105
    dprintf("flushed %zu of %zu byte(s)\n", offset, s->buffer_size);
105
    DPRINTF("flushed %zu of %zu byte(s)\n", offset, s->buffer_size);
106 106
    memmove(s->buffer, s->buffer + offset, s->buffer_size - offset);
107 107
    s->buffer_size -= offset;
108 108
}
......
113 113
    int offset = 0;
114 114
    ssize_t ret;
115 115

  
116
    dprintf("putting %d bytes at %" PRId64 "\n", size, pos);
116
    DPRINTF("putting %d bytes at %" PRId64 "\n", size, pos);
117 117

  
118 118
    if (s->has_error) {
119
        dprintf("flush when error, bailing\n");
119
        DPRINTF("flush when error, bailing\n");
120 120
        return -EINVAL;
121 121
    }
122 122

  
123
    dprintf("unfreezing output\n");
123
    DPRINTF("unfreezing output\n");
124 124
    s->freeze_output = 0;
125 125

  
126 126
    buffered_flush(s);
127 127

  
128 128
    while (!s->freeze_output && offset < size) {
129 129
        if (s->bytes_xfer > s->xfer_limit) {
130
            dprintf("transfer limit exceeded when putting\n");
130
            DPRINTF("transfer limit exceeded when putting\n");
131 131
            break;
132 132
        }
133 133

  
134 134
        ret = s->put_buffer(s->opaque, buf + offset, size - offset);
135 135
        if (ret == -EAGAIN) {
136
            dprintf("backend not ready, freezing\n");
136
            DPRINTF("backend not ready, freezing\n");
137 137
            s->freeze_output = 1;
138 138
            break;
139 139
        }
140 140

  
141 141
        if (ret <= 0) {
142
            dprintf("error putting\n");
142
            DPRINTF("error putting\n");
143 143
            s->has_error = 1;
144 144
            offset = -EINVAL;
145 145
            break;
146 146
        }
147 147

  
148
        dprintf("put %zd byte(s)\n", ret);
148
        DPRINTF("put %zd byte(s)\n", ret);
149 149
        offset += ret;
150 150
        s->bytes_xfer += ret;
151 151
    }
152 152

  
153 153
    if (offset >= 0) {
154
        dprintf("buffering %d bytes\n", size - offset);
154
        DPRINTF("buffering %d bytes\n", size - offset);
155 155
        buffered_append(s, buf + offset, size - offset);
156 156
        offset = size;
157 157
    }
......
164 164
    QEMUFileBuffered *s = opaque;
165 165
    int ret;
166 166

  
167
    dprintf("closing\n");
167
    DPRINTF("closing\n");
168 168

  
169 169
    while (!s->has_error && s->buffer_size) {
170 170
        buffered_flush(s);

Also available in: Unified diff