~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to ustd/ustd.c

  • Committer: Pierre-Marc Fournier
  • Date: 2009-10-27 22:58:15 UTC
  • mfrom: (232.1.5)
  • Revision ID: git-v1:aa08b4413291fabcbd1b1144377d37034ad361de
Merge branch 'for-pierre-marc' of git://git.infradead.org/users/jblunck/ust

Fixed conflicts:
        include/ust/marker.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
#include <getopt.h>
34
34
 
35
35
#include "ustd.h"
36
 
#include "localerr.h"
 
36
#include "usterr.h"
37
37
#include "ustcomm.h"
38
 
#include "share.h"
39
38
 
40
39
/* return value: 0 = subbuffer is finished, it won't produce data anymore
41
40
 *               1 = got subbuffer successfully