[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.33 by root, Tue Sep 12 00:53:56 2006 UTC vs.
Revision 1.40 by root, Thu Sep 14 00:07:15 2006 UTC

…		…
32	#include <object.h>	32	#include <object.h>
33	#include <funcpoint.h>	33	#include <funcpoint.h>
34	#include <loader.h>	34	#include <loader.h>
35		35
36	int nrofallocobjects = 0;	36	int nrofallocobjects = 0;
		37	static UUID uuid;
		38	const uint64 UUID_SKIP = 1<<19;
37		39
38	object objects; / Pointer to the list of used objects */	40	object objects; / Pointer to the list of used objects */
39	object active_objects; / List of active objects that need to be processed */	41	object active_objects; / List of active objects that need to be processed */
40		42
41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
49	};	51	};
50	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	55	};
		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %lld\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
54		133
55	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56	static int	135	static int
57	compare_ob_value_lists_one (const object wants, const object has)	136	compare_ob_value_lists_one (const object wants, const object has)
58	{	137	{
…		…
254	{	333	{
255	if (inv->inv)	334	if (inv->inv)
256	sum_weight (inv);	335	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	336	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	337	}
		338
259	if (op->type == CONTAINER && op->stats.Str)	339	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	340	sum = (sum * (100 - op->stats.Str)) / 100;
		341
261	if (op->carrying != sum)	342	if (op->carrying != sum)
262	op->carrying = sum;	343	op->carrying = sum;
		344
263	return sum;	345	return sum;
264	}	346	}
265		347
266	/**	348	/**
267	* Return the outermost environment object for a given object.	349	* Return the outermost environment object for a given object.
…		…
416	*/	498	*/
417		499
418	object *	500	object *
419	find_object_name (const char *str)	501	find_object_name (const char *str)
420	{	502	{
421	const char *name = shstr::find (str);	503	shstr_cmp str_ (str);
422	object *op;	504	object *op;
423		505
424	for (op = objects; op != NULL; op = op->next)	506	for (op = objects; op != NULL; op = op->next)
425	if (&op->name == name)	507	if (op->name == str_)
426	break;	508	break;
427		509
428	return op;	510	return op;
429	}	511	}
430		512
…		…
836	if (op->more != NULL)	918	if (op->more != NULL)
837	update_object (op->more, action);	919	update_object (op->more, action);
838	}	920	}
839		921
840	static unordered_vector<object *> mortals;	922	static unordered_vector<object *> mortals;
841	static std::vector<object *> freed;	923	static std::vector<object , slice_allocator <object > > freed;
842		924
843	void object::free_mortals ()	925	void object::free_mortals ()
844	{	926	{
845	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	927	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
846	if ((*i)->refcnt)	928	if ((*i)->refcnt)
847	++i; // further delay freeing	929	++i; // further delay freeing
848	else	930	else
849	{	931	{
850	freed.push_back (*i);//D	932	//freed.push_back (*i);//D
851	//delete *i;	933	delete *i;
852	mortals.erase (i);	934	mortals.erase (i);
853	}	935	}
854		936
855	if (mortals.size())//D	937	if (mortals.size() && 0)//D
856	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D	938	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
857	}	939	}
858		940
859	object::object ()	941	object::object ()
860	{	942	{
…		…
884	}	966	}
885		967
886	void object::unlink ()	968	void object::unlink ()
887	{	969	{
888	count = 0;	970	count = 0;
		971	uuid = gen_uuid ();
		972
		973	if (this == objects)
		974	objects = next;
889		975
890	/* Remove this object from the list of used objects */	976	/* Remove this object from the list of used objects */
891	if (prev)	977	if (prev)
892	{	978	{
893	prev->next = next;	979	prev->next = next;
…		…
897	if (next)	983	if (next)
898	{	984	{
899	next->prev = prev;	985	next->prev = prev;
900	next = 0;	986	next = 0;
901	}	987	}
902
903	if (this == objects)
904	objects = next;
905	}	988	}
906		989
907	object *object::create ()	990	object *object::create ()
908	{	991	{
909	object *op;	992	object *op;
…		…
1222	* This function goes through all objects below and including top, and	1305	* This function goes through all objects below and including top, and
1223	* merges op to the first matching object.	1306	* merges op to the first matching object.
1224	* If top is NULL, it is calculated.	1307	* If top is NULL, it is calculated.
1225	* Returns pointer to object if it succeded in the merge, otherwise NULL	1308	* Returns pointer to object if it succeded in the merge, otherwise NULL
1226	*/	1309	*/
1227
1228	object *	1310	object *
1229	merge_ob (object op, object top)	1311	merge_ob (object op, object top)
1230	{	1312	{
1231	if (!op->nrof)	1313	if (!op->nrof)
1232	return 0;	1314	return 0;
…		…
2720	* The returned string is shared.	2802	* The returned string is shared.
2721	*/	2803	*/
2722	const char *	2804	const char *
2723	get_ob_key_value (const object op, const char const key)	2805	get_ob_key_value (const object op, const char const key)
2724	{	2806	{
2725	key_value *	2807	key_value *link;
2726	link;	2808	shstr_cmp canonical_key (key);
2727	const char *
2728	canonical_key;
2729		2809
2730	canonical_key = shstr::find (key);
2731
2732	if (canonical_key == NULL)	2810	if (!canonical_key)
2733	{	2811	{
2734	/* 1. There being a field named key on any object	2812	/* 1. There being a field named key on any object
2735	* implies there'd be a shared string to find.	2813	* implies there'd be a shared string to find.
2736	* 2. Since there isn't, no object has this field.	2814	* 2. Since there isn't, no object has this field.
2737	* 3. Therefore, this object doesn't have this field.	2815	* 3. Therefore, this object doesn't have this field.
2738	*/	2816	*/
2739	return NULL;	2817	return 0;
2740	}	2818	}
2741		2819
2742	/* This is copied from get_ob_key_link() above -	2820	/* This is copied from get_ob_key_link() above -
2743	* only 4 lines, and saves the function call overhead.	2821	* only 4 lines, and saves the function call overhead.
2744	*/	2822	*/
2745	for (link = op->key_values; link != NULL; link = link->next)	2823	for (link = op->key_values; link; link = link->next)
2746	{
2747	if (link->key == canonical_key)	2824	if (link->key == canonical_key)
2748	{
2749	return link->value;	2825	return link->value;
2750	}	2826
2751	}
2752	return NULL;	2827	return 0;
2753	}	2828	}
2754		2829
2755		2830
2756	/*	2831	/*
2757	* Updates the canonical_key in op to value.	2832	* Updates the canonical_key in op to value.
…		…
2843	shstr key_ (key);	2918	shstr key_ (key);
2844		2919
2845	return set_ob_key_value_s (op, key_, value, add_key);	2920	return set_ob_key_value_s (op, key_, value, add_key);
2846	}	2921	}
2847		2922
		2923	object::depth_iterator::depth_iterator (object *container)
		2924	: iterator_base (container)
		2925	{
		2926	while (item->inv)
		2927	item = item->inv;
		2928	}
		2929
2848	void	2930	void
2849	object::deep_iterator::next ()	2931	object::depth_iterator::next ()
2850	{	2932	{
2851	if (item->inv)
2852	item = item->inv;
2853	else if (item->below)	2933	if (item->below)
		2934	{
2854	item = item->below;	2935	item = item->below;
		2936
		2937	while (item->inv)
		2938	item = item->inv;
		2939	}
2855	else	2940	else
2856	item = item->env->below;	2941	item = item->env;
2857	}	2942	}
		2943
		2944	// return a suitable string describing an objetc in enough detail to find it
		2945	const char *
		2946	object::debug_desc (char *info) const
		2947	{
		2948	char info2[256 * 3];
		2949	char *p = info;
		2950
		2951	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2952	count,
		2953	&name,
		2954	title ? " " : "",
		2955	title ? (const char *)title : "");
		2956
		2957	if (env)
		2958	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2959
		2960	if (map)
		2961	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2962
		2963	return info;
		2964	}
		2965
		2966	const char *
		2967	object::debug_desc () const
		2968	{
		2969	static char info[256 * 3];
		2970	return debug_desc (info);
		2971	}
		2972

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/object.C (file contents): Revision 1.33 by root, Tue Sep 12 00:53:56 2006 UTC vs. Revision 1.40 by root, Thu Sep 14 00:07:15 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.33 by root, Tue Sep 12 00:53:56 2006 UTC vs.
Revision 1.40 by root, Thu Sep 14 00:07:15 2006 UTC