← Back to branch summary

~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to src/util/threads-win32.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/util/threads-win32.c
155
155
        if (!event) {
156
156
            return -1;
157
157
        }
158
 
        virThreadLocalSet(&virCondEvent, event);
 
158
        if (virThreadLocalSet(&virCondEvent, event) < 0) {
 
159
            CloseHandle(event);
 
160
            return -1;
 
161
        }
159
162
    }
160
163
 
161
164
    virMutexLock(&c->lock);
313
316
void virThreadSelf(virThreadPtr thread)
314
317
{
315
318
    virThreadPtr self = TlsGetValue(selfkey);
316
 
    thread->thread = self->thread;
317
 
    thread->joinable = self->joinable;
 
319
 
 
320
    if (self == NULL) {
 
321
        /* called on a thread not created by virThreadCreate, e.g. the main thread */
 
322
        thread->thread = 0;
 
323
        thread->joinable = false;
 
324
    } else {
 
325
        thread->thread = self->thread;
 
326
        thread->joinable = self->joinable;
 
327
    }
318
328
}
319
329
 
320
330
bool virThreadIsSelf(virThreadPtr thread)
333
343
/* For debugging use only; see comments in threads-pthread.c.  */
334
344
int virThreadID(virThreadPtr thread)
335
345
{
336
 
    return (int)thread->thread;
 
346
    return (intptr_t)thread->thread;
337
347
}
338
348
 
339
349
 
376
386
    return TlsGetValue(l->key);
377
387
}
378
388
 
379
 
void virThreadLocalSet(virThreadLocalPtr l, void *val)
 
389
int virThreadLocalSet(virThreadLocalPtr l, void *val)
380
390
{
381
 
    TlsSetValue(l->key, val);
 
391
    return TlsSetValue(l->key, val) == 0 ? -1 : 0;
382
392
}