+
/*****************************************************************************
* RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
* Copyright by Florian Forster, 2008
char *tmplt = NULL;
rrd_info_t *result = NULL;
rrd_infoval_t rc;
+ char *opt_daemon = NULL;
struct option long_options[] = {
{"template", required_argument, 0, 't'},
{0, 0, 0, 0}
}
}
+ opt_daemon = getenv (ENV_RRDCACHED_ADDRESS);
+ if (opt_daemon != NULL) {
+ rrd_set_error ("The \"%s\" environment variable is defined, "
+ "but \"%s\" cannot work with rrdcached. Either unset "
+ "the environment variable or use \"update\" instead.",
+ ENV_RRDCACHED_ADDRESS, argv[0]);
+ goto end_tag;
+ }
+
/* need at least 2 arguments: filename, data. */
if (argc - optind < 2) {
rrd_set_error("Not enough arguments");
goto out;
}
- if ((tmplt != NULL) && (opt_daemon != NULL))
+ { /* try to connect to rrdcached */
+ int status = rrdc_connect(opt_daemon);
+ if (status != 0) return status;
+ }
+
+ if ((tmplt != NULL) && rrdc_is_connected(opt_daemon))
{
- rrd_set_error("The caching opt_daemon cannot be used together with "
+ rrd_set_error("The caching daemon cannot be used together with "
"templates yet.");
goto out;
}
- if ((tmplt == NULL) && (opt_daemon == NULL))
+ if (! rrdc_is_connected(opt_daemon))
{
- char *temp;
-
- temp = getenv (ENV_RRDCACHED_ADDRESS);
- if (temp != NULL)
- {
- opt_daemon = strdup (temp);
- if (opt_daemon == NULL)
- {
- rrd_set_error("strdup failed.");
- goto out;
- }
- }
+ rc = rrd_update_r(argv[optind], tmplt,
+ argc - optind - 1, (const char **) (argv + optind + 1));
}
-
- if (opt_daemon != NULL)
+ else /* we are connected */
{
- int status;
-
- status = rrdc_connect (opt_daemon);
- if (status != 0)
- {
- rrd_set_error("Unable to connect to opt_daemon: %s",
- (status < 0)
- ? "Internal error"
- : rrd_strerror (status));
- goto out;
- }
-
- status = rrdc_update (/* file = */ argv[optind],
- /* values_num = */ argc - optind - 1,
- /* values = */ (void *) (argv + optind + 1));
- if (status != 0)
- {
- rrd_set_error("Failed sending the values to the opt_daemon: %s",
- (status < 0)
- ? "Internal error"
- : rrd_strerror (status));
- }
- else
- {
- rc = 0;
- }
-
- rrdc_disconnect ();
- goto out;
- } /* if (opt_daemon != NULL) */
+ rc = rrdc_update (argv[optind], /* file */
+ argc - optind - 1, /* values_num */
+ (const char *const *) (argv + optind + 1)); /* values */
+ if (rc > 0)
+ rrd_set_error("Failed sending the values to rrdcached: %s",
+ rrd_strerror (rc));
+ }
- rc = rrd_update_r(argv[optind], tmplt,
- argc - optind - 1, (const char **) (argv + optind + 1));
out:
if (tmplt != NULL)
{
goto err_out;
}
+ rrd_init(&rrd);
if ((rrd_file = rrd_open(filename, &rrd, RRD_READWRITE)) == NULL) {
goto err_free;
}
}
/*
- * get exclusive lock to whole file.
- * lock gets removed when we close the file
- *
- * returns 0 on success
- */
-int rrd_lock(
- rrd_file_t *file)
-{
- int rcstat;
-
- {
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
- struct _stat st;
-
- if (_fstat(file->fd, &st) == 0) {
- rcstat = _locking(file->fd, _LK_NBLCK, st.st_size);
- } else {
- rcstat = -1;
- }
-#else
- struct flock lock;
-
- lock.l_type = F_WRLCK; /* exclusive write lock */
- lock.l_len = 0; /* whole file */
- lock.l_start = 0; /* start of file */
- lock.l_whence = SEEK_SET; /* end of file */
-
- rcstat = fcntl(file->fd, F_SETLK, &lock);
-#endif
- }
-
- return (rcstat);
-}
-
-/*
* Allocate some important arrays used, and initialize the template.
*
* When it returns, either all of the structures are allocated
(rrd_file, rrd, rra_idx, scratch_idx,
pcdp_summary, rra_time) == -1)
return -1;
+
+ rrd_notify_row(rrd_file, rra_idx, rra_pos_new, rra_time);
}
rra_start += rra_def->row_cnt * ds_cnt * sizeof(rrd_value_t);