[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.455 by root, Sat Sep 27 08:17:40 2008 UTC

…		…
66	$Storable::canonical = 1; # reduce rsync transfers	66	$Storable::canonical = 1; # reduce rsync transfers
67	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	67	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68		68
69	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	69	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70		70
71	{	71	# make sure c-lzf reinitialises itself
72	# very ugly, but ensure we acquire the storable lock
73
74	sub net_mstore {
75	my $guard = Coro::Storable::guard;
76	&Storable::net_mstore
77	}
78
79	sub mretrieve {
80	my $guard = Coro::Storable::guard;
81	&Storable::mretrieve
82	}
83
84	Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";	72	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	73	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86	}
87		74
88	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	75	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89		76
90	our %COMMAND = ();	77	our %COMMAND = ();
91	our %COMMAND_TIME = ();	78	our %COMMAND_TIME = ();
…		…
94	our %EXTCMD = ();	81	our %EXTCMD = ();
95	our %EXTICMD = ();	82	our %EXTICMD = ();
96	our %EXT_CORO = (); # coroutines bound to extensions	83	our %EXT_CORO = (); # coroutines bound to extensions
97	our %EXT_MAP = (); # pluggable maps	84	our %EXT_MAP = (); # pluggable maps
98		85
99	our $RELOAD; # number of reloads so far	86	our $RELOAD; # number of reloads so far, non-zero while in reload
100	our @EVENT;	87	our @EVENT;
101		88
102	our $CONFDIR = confdir;	89	our $CONFDIR = confdir;
103	our $DATADIR = datadir;	90	our $DATADIR = datadir;
104	our $LIBDIR = "$DATADIR/ext";	91	our $LIBDIR = "$DATADIR/ext";
…		…
141	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	128	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142	our $LOADAVG; # same thing, but with alpha-smoothing	129	our $LOADAVG; # same thing, but with alpha-smoothing
143	our $JITTER; # average jitter	130	our $JITTER; # average jitter
144	our $TICK_START; # for load detecting purposes	131	our $TICK_START; # for load detecting purposes
145		132
		133	our @POST_INIT;
		134
146	binmode STDOUT;	135	binmode STDOUT;
147	binmode STDERR;	136	binmode STDERR;
148		137
149	# read virtual server time, if available	138	# read virtual server time, if available
150	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {	139	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {
…		…
318	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	307	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319		308
320	sub encode_json($) { $json_coder->encode ($_[0]) }	309	sub encode_json($) { $json_coder->encode ($_[0]) }
321	sub decode_json($) { $json_coder->decode ($_[0]) }	310	sub decode_json($) { $json_coder->decode ($_[0]) }
322		311
		312	=item cf::post_init { BLOCK }
		313
		314	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		315	but I<before> the server starts ticking again.
		316
		317	The cdoeblock will have a single boolean argument to indicate whether this
		318	is a reload or not.
		319
		320	=cut
		321
		322	sub post_init(&) {
		323	push @POST_INIT, shift;
		324	}
		325
323	=item cf::lock_wait $string	326	=item cf::lock_wait $string
324		327
325	Wait until the given lock is available. See cf::lock_acquire.	328	Wait until the given lock is available. See cf::lock_acquire.
326		329
327	=item my $lock = cf::lock_acquire $string	330	=item my $lock = cf::lock_acquire $string
…		…
354	return;#d#	357	return;#d#
355	}#d#	358	}#d#
356		359
357	# wait for lock, if any	360	# wait for lock, if any
358	while ($LOCK{$key}) {	361	while ($LOCK{$key}) {
		362	#local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
359	push @{ $LOCK{$key} }, $Coro::current;	363	push @{ $LOCK{$key} }, $Coro::current;
360	Coro::schedule;	364	Coro::schedule;
361	}	365	}
362	}	366	}
363		367
…		…
1457		1461
1458	sub exists($) {	1462	sub exists($) {
1459	my ($login) = @_;	1463	my ($login) = @_;
1460		1464
1461	$cf::PLAYER{$login}	1465	$cf::PLAYER{$login}
1462	or cf::sync_job { !aio_stat path $login }	1466	or !aio_stat path $login
1463	}	1467	}
1464		1468
1465	sub find($) {	1469	sub find($) {
1466	return $cf::PLAYER{$_[0]} \|\| do {	1470	return $cf::PLAYER{$_[0]} \|\| do {
1467	my $login = $_[0];	1471	my $login = $_[0];
…		…
2784	id => "infobox",	2788	id => "infobox",
2785	title => "Body Parts",	2789	title => "Body Parts",
2786	reply => undef,	2790	reply => undef,
2787	tooltip => "Shows which body parts you posess and are available",	2791	tooltip => "Shows which body parts you posess and are available",
2788	},	2792	},
		2793	"c/skills" => {
		2794	id => "infobox",
		2795	title => "Skills",
		2796	reply => undef,
		2797	tooltip => "Shows your experience per skill and item power",
		2798	},
2789	"c/uptime" => {	2799	"c/uptime" => {
2790	id => "infobox",	2800	id => "infobox",
2791	title => "Uptime",	2801	title => "Uptime",
2792	reply => undef,	2802	reply => undef,
2793	tooltip => "How long the server has been running since last restart",	2803	tooltip => "How long the server has been running since last restart",
…		…
3347	reload_treasures;	3357	reload_treasures;
3348		3358
3349	warn "finished reloading resource files\n";	3359	warn "finished reloading resource files\n";
3350	}	3360	}
3351		3361
3352	sub init {
3353	my $guard = freeze_mainloop;
3354
3355	evthread_start IO::AIO::poll_fileno;
3356
3357	reload_resources;
3358	}
3359
3360	sub reload_config {	3362	sub reload_config {
3361	open my $fh, "<:utf8", "$CONFDIR/config"	3363	open my $fh, "<:utf8", "$CONFDIR/config"
3362	or return;	3364	or return;
3363		3365
3364	local $/;	3366	local $/;
…		…
3396	seek $fh, 0, 0;	3398	seek $fh, 0, 0;
3397	print $fh $$;	3399	print $fh $$;
3398	}	3400	}
3399		3401
3400	sub main {	3402	sub main {
3401	atomic;	3403	cf::init_globals; # initialise logging
		3404
		3405	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3406	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3407	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3408	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3409
		3410	cf::init_experience;
		3411	cf::init_anim;
		3412	cf::init_attackmess;
		3413	cf::init_dynamic;
		3414	cf::init_block;
		3415
		3416	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402		3417
3403	# we must not ever block the main coroutine	3418	# we must not ever block the main coroutine
3404	local $Coro::idle = sub {	3419	local $Coro::idle = sub {
3405	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3420	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406	(async {	3421	(async {
3407	$Coro::current->{desc} = "IDLE BUG HANDLER";	3422	$Coro::current->{desc} = "IDLE BUG HANDLER";
3408	EV::loop EV::LOOP_ONESHOT;	3423	EV::loop EV::LOOP_ONESHOT;
3409	})->prio (Coro::PRIO_MAX);	3424	})->prio (Coro::PRIO_MAX);
3410	};	3425	};
3411		3426
3412	{	3427	evthread_start IO::AIO::poll_fileno;
3413	my $guard = freeze_mainloop;	3428
		3429	cf::sync_job {
		3430	reload_resources;
3414	reload_config;	3431	reload_config;
3415	db_init;	3432	db_init;
		3433
		3434	cf::load_settings;
		3435	cf::load_materials;
		3436	cf::init_uuid;
		3437	cf::init_signals;
		3438	cf::init_commands;
		3439	cf::init_skills;
		3440
		3441	cf::init_beforeplay;
		3442
		3443	atomic;
		3444
3416	load_extensions;	3445	load_extensions;
3417		3446
3418	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419	}
3420
3421	utime time, time, $RUNTIMEFILE;	3447	utime time, time, $RUNTIMEFILE;
3422		3448
3423	# no (long-running) fork's whatsoever before this point(!)	3449	# no (long-running) fork's whatsoever before this point(!)
3424	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3450	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3451
		3452	(pop @POST_INIT)->(0) while @POST_INIT;
		3453	};
3425		3454
3426	EV::loop;	3455	EV::loop;
3427	}	3456	}
3428		3457
3429	#############################################################################	3458	#############################################################################
…		…
3487	my $uuid = "$LOCALDIR/uuid";	3516	my $uuid = "$LOCALDIR/uuid";
3488		3517
3489	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3518	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3490	or return;	3519	or return;
3491		3520
3492	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3521	my $value = uuid_seq uuid_cur;
		3522
		3523	unless ($value) {
		3524	warn "cowardly refusing to write zero uuid value!\n";
		3525	return;
		3526	}
		3527
		3528	my $value = uuid_str $value + $uuid_skip;
3493	$uuid_skip = 0;	3529	$uuid_skip = 0;
3494		3530
3495	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3531	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3496	and return;	3532	and return;
3497		3533
…		…
3587	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3623	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588	for my $name (keys %$leaf_symtab) {	3624	for my $name (keys %$leaf_symtab) {
3589	_gv_clear *{"$pkg$name"};	3625	_gv_clear *{"$pkg$name"};
3590	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3626	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591	}	3627	}
3592	warn "cleared package #$pkg\n";#d#	3628	warn "cleared package $pkg\n";#d#
3593	}	3629	}
3594
3595	our $RELOAD; # how many times to reload
3596		3630
3597	sub do_reload_perl() {	3631	sub do_reload_perl() {
3598	# can/must only be called in main	3632	# can/must only be called in main
3599	if ($Coro::current != $Coro::main) {	3633	if ($Coro::current != $Coro::main) {
3600	warn "can only reload from main coroutine";	3634	warn "can only reload from main coroutine";
…		…
3695	warn "reattaching attachments to maps";	3729	warn "reattaching attachments to maps";
3696	reattach $_ for values %MAP;	3730	reattach $_ for values %MAP;
3697	warn "reattaching attachments to players";	3731	warn "reattaching attachments to players";
3698	reattach $_ for values %PLAYER;	3732	reattach $_ for values %PLAYER;
3699		3733
		3734	warn "running post_load";
		3735	(pop @POST_INIT)->(1) while @POST_INIT;
		3736
3700	warn "leaving sync_job";	3737	warn "leaving sync_job";
3701		3738
3702	1	3739	1
3703	} or do {	3740	} or do {
3704	warn $@;	3741	warn $@;
…		…
3714		3751
3715	sub reload_perl() {	3752	sub reload_perl() {
3716	# doing reload synchronously and two reloads happen back-to-back,	3753	# doing reload synchronously and two reloads happen back-to-back,
3717	# coro crashes during coro_state_free->destroy here.	3754	# coro crashes during coro_state_free->destroy here.
3718		3755
3719	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3756	$RELOAD_WATCHER \|\|= EV::timer $TICK * 1.5, 0, sub {
3720	do_reload_perl;	3757	do_reload_perl;
3721	undef $RELOAD_WATCHER;	3758	undef $RELOAD_WATCHER;
3722	};	3759	};
3723	}	3760	}
3724		3761

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC vs. Revision 1.455 by root, Sat Sep 27 08:17:40 2008 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.455 by root, Sat Sep 27 08:17:40 2008 UTC