Browse Source

Add timestamps to stratum_share structs as they're generated and copy the stratum sessionid if it exists to stratum work generated.

Con Kolivas 13 years ago
parent
commit
1bf1f4a217
2 changed files with 5 additions and 1 deletions
  1. 4 1
      cgminer.c
  2. 1 0
      miner.h

+ 4 - 1
cgminer.c

@@ -240,6 +240,7 @@ struct stratum_share {
 	bool block;
 	bool block;
 	struct work *work;
 	struct work *work;
 	int id;
 	int id;
+	time_t sshare_time;
 };
 };
 
 
 static struct stratum_share *stratum_shares = NULL;
 static struct stratum_share *stratum_shares = NULL;
@@ -3152,6 +3153,7 @@ static void *submit_work_thread(void *userdata)
 		char *noncehex;
 		char *noncehex;
 		char s[1024];
 		char s[1024];
 
 
+		sshare->sshare_time = time(NULL);
 		/* This work item is freed in parse_stratum_response */
 		/* This work item is freed in parse_stratum_response */
 		sshare->work = work;
 		sshare->work = work;
 		mutex_lock(&sshare_lock);
 		mutex_lock(&sshare_lock);
@@ -5159,7 +5161,8 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
 	/* Copy parameters required for share submission */
 	/* Copy parameters required for share submission */
 	work->job_id = strdup(pool->swork.job_id);
 	work->job_id = strdup(pool->swork.job_id);
 	work->ntime = strdup(pool->swork.ntime);
 	work->ntime = strdup(pool->swork.ntime);
-
+	if (pool->sessionid)
+		work->sessionid = strdup(pool->sessionid);
 	mutex_unlock(&pool->pool_lock);
 	mutex_unlock(&pool->pool_lock);
 
 
 	applog(LOG_DEBUG, "Generated stratum merkle %s", merkle_hash);
 	applog(LOG_DEBUG, "Generated stratum merkle %s", merkle_hash);

+ 1 - 0
miner.h

@@ -1006,6 +1006,7 @@ struct work {
 	char		*nonce2;
 	char		*nonce2;
 	char		*ntime;
 	char		*ntime;
 	double		sdiff;
 	double		sdiff;
+	char		*sessionid;
 
 
 	bool		gbt;
 	bool		gbt;
 	char		*gbt_coinbase;
 	char		*gbt_coinbase;