ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.463 by root, Sun Dec 28 06:59:27 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5; 56use Digest::MD5;
30use Fcntl; 57use Fcntl;
31use YAML::Syck (); 58use YAML ();
32use IO::AIO 2.32 (); 59use IO::AIO ();
33use Time::HiRes; 60use Time::HiRes;
34use Compress::LZF; 61use Compress::LZF;
35use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
36 65
37# configure various modules to our taste 66# configure various modules to our taste
38# 67#
39$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 76
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 78
52our %COMMAND = (); 79our %COMMAND = ();
53our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
56our %EXTCMD = (); 83our %EXTCMD = ();
57our %EXTICMD = (); 84our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
60 87
61our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 89our @EVENT;
63 90
64our $CONFDIR = confdir; 91our $CONFDIR = confdir;
65our $DATADIR = datadir; 92our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
75 106
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 109our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
83 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 115our $DB_ENV;
86 116
87our %CFG; 117our %CFG;
88 118
89our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 120our $RUNTIME;
121our $NOW;
91 122
92our (%PLAYER, %PLAYER_LOADING); # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 124our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
95 126
96# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 129
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
102 138
103binmode STDOUT; 139binmode STDOUT;
104binmode STDERR; 140binmode STDERR;
105 141
106# read virtual server time, if available 142# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
111} 147}
112 148
113mkdir $_ 149mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
159 195
160The raw value load value from the last tick. 196The raw value load value from the last tick.
161 197
162=item %cf::CFG 198=item %cf::CFG
163 199
164Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 201from wherever your confdir points to.
166 202
167=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
168 204
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 223 $msg .= "\n"
188 unless $msg =~ /\n$/; 224 unless $msg =~ /\n$/;
189 225
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 227
192 utf8::encode $msg;
193 LOG llevError, $msg; 228 LOG llevError, $msg;
194 }; 229 };
195} 230}
231
232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate
243};
244
245$SIG{__DIE__} = sub { }; #d#?
196 246
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 257for my $pkg (qw(
208 cf::global cf::attachable 258 cf::global cf::attachable
209 cf::object cf::object::player 259 cf::object cf::object::player
210 cf::client cf::player 260 cf::client cf::player
211 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
212 cf::map cf::party cf::region 263 cf::party cf::region
213)) { 264)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 266}
217 267
218$Event::DIED = sub { 268$EV::DIED = sub {
219 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
220}; 270};
221 271
222############################################################################# 272#############################################################################
223 273
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 297 $d
248 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
249} 299}
250 300
251=item $ref = cf::from_json $json 301=item $ref = cf::decode_json $json
252 302
253Converts a JSON string into the corresponding perl data structure. 303Converts a JSON string into the corresponding perl data structure.
254 304
255=item $json = cf::to_json $ref 305=item $json = cf::encode_json $ref
256 306
257Converts a perl data structure into its JSON representation. 307Converts a perl data structure into its JSON representation.
258 308
259=cut 309=cut
260 310
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 312
263sub to_json ($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
265 329
266=item cf::lock_wait $string 330=item cf::lock_wait $string
267 331
268Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
269 333
270=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
271 335
272Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
275returned. 339returned.
276 340
277Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 342deadlocked coro.
284 348
285Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
286 350
287=cut 351=cut
288 352
289our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 354
292sub lock_wait($) { 355sub lock_wait($) {
293 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 357}
306 358
307sub lock_acquire($) { 359sub lock_acquire($) {
308 my ($key) = @_; 360 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 361}
322 362
323sub lock_active($) { 363sub lock_active($) {
324 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 365}
328 366
329sub freeze_mainloop { 367sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
331 369
332 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start; 371}
334 }; 372
335 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
336 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
337} 386}
338 387
339=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
340 389
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
352our @SLOT_QUEUE; 401our @SLOT_QUEUE;
353our $SLOT_QUEUE; 402our $SLOT_QUEUE;
354 403
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
357 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
358 409
359 while () { 410 while () {
360 next_job: 411 next_job:
361 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
369 } 420 }
370 } 421 }
371 } 422 }
372 423
373 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 427 $signal->wait;
377 } else { 428 } else {
378 Coro::schedule; 429 Coro::schedule;
379 } 430 }
380 } 431 }
381}; 432};
382 433
383sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
384 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
385 438
386 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
388 441
402 455
403BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
404 457
405=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
406 459
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 463acceptable.
411 464
412If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
418 471
419sub sync_job(&) { 472sub sync_job(&) {
420 my ($job) = @_; 473 my ($job) = @_;
421 474
422 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 476 my $time = EV::time;
424 477
425 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
427 480
428 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 482
430 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
431 484
432 my $busy = 1; 485 my $busy = 1;
433 my @res; 486 my @res;
434 487
435 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 490 @res = eval { $job->() };
437 warn $@ if $@; 491 warn $@ if $@;
438 undef $busy; 492 undef $busy;
439 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
440 494
441 while ($busy) { 495 while ($busy) {
442 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
443 } 500 }
501 }
444 502
445 $time = Event::time - $time; 503 my $time = EV::time - $time;
446 504
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
451 506
452 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
453 } else { 508 } else {
454 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
455 510
480=item fork_call { }, $args 535=item fork_call { }, $args
481 536
482Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
486 541
487=cut 542=cut
488 543
489sub fork_call(&@) { 544sub fork_call(&@) {
490 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
499 }, @args; 554 }, @args;
500 555
501 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
502} 557}
503 558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
584}
585
504=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
505 587
506Returns a single value from the environment database. 588Returns a single value from the environment database.
507 589
508=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
509 591
510Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
513=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
514 618
515our $DB; 619our $DB;
516 620
517sub db_init { 621sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 622 cf::sync_job {
522 eval { 623 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 624 };
532} 625}
533 626
534sub db_get($$) { 627sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
536 629
634 727
635############################################################################# 728#############################################################################
636 729
637=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
638 731
639Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
640attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
642 735
643In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 738Deliantra).
646 739
647=over 4 740=over 4
648 741
649=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
650 743
694=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
695 788
696Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
698 791
699Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
700that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
701 794
702These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
703 796
704=over 4 797=over 4
932 } 1025 }
933 1026
934 0 1027 0
935} 1028}
936 1029
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1031
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1033
941Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
942 1035
948 1041
949=cut 1042=cut
950 1043
951############################################################################# 1044#############################################################################
952# object support 1045# object support
953#
954 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
955sub _can_merge { 1080sub _can_merge {
956 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
957 1082
958 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1084
962 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
963} 1087}
964 1088
965sub reattach { 1089sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1091 my ($obj) = @_;
968 1092
1093 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1095
971 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
972 1097
973 @$registry = (); 1098 @$registry = ();
974 1099
989cf::attachable->attach ( 1114cf::attachable->attach (
990 prio => -1000000, 1115 prio => -1000000,
991 on_instantiate => sub { 1116 on_instantiate => sub {
992 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
993 1118
994 $data = from_json $data; 1119 $data = decode_json $data;
995 1120
996 for (@$data) { 1121 for (@$data) {
997 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
998 1123
999 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1013); 1138);
1014 1139
1015sub object_freezer_save { 1140sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1017 1142
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1143 sync_job {
1021 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1024 1148
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1153 aio_close $fh;
1030 1154
1031 if (@$objs) { 1155 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1161 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1163 }
1040 } else { 1164 } else {
1041 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1042 } 1166 }
1043 1167
1044 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1172 } else {
1046 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1047 } 1174 }
1048 } else { 1175 } else {
1049 aio_unlink $filename; 1176 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1051 } 1178 }
1052 }; 1179 };
1053
1054 undef $guard;
1055} 1180}
1056 1181
1057sub object_freezer_as_string { 1182sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
1059 1184
1064 1189
1065sub object_thawer_load { 1190sub object_thawer_load {
1066 my ($filename) = @_; 1191 my ($filename) = @_;
1067 1192
1068 my ($data, $av); 1193 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1194
1072 (aio_load $filename, $data) >= 0 1195 (aio_load $filename, $data) >= 0
1073 or return; 1196 or return;
1074 1197
1075 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1200 or return;
1078 1201
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1081 } 1204 }
1082 1205
1206 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1085 1209
1086 ($data, $av) 1210 ($data, $av)
1087} 1211}
1088 1212
1089=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1145 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1146 1270
1147 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1148} 1272}
1149 1273
1274use File::Glob ();
1275
1150cf::player->attach ( 1276cf::player->attach (
1151 on_command => sub { 1277 on_command => sub {
1152 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1153 1279
1154 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1186 1312
1187 cf::override; 1313 cf::override;
1188 }, 1314 },
1189); 1315);
1190 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1191sub load_extensions { 1330sub load_extensions {
1192 cf::sync_job { 1331 cf::sync_job {
1193 my %todo; 1332 my %todo;
1194 1333
1195 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
1214 1353
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1356
1218 $ext{source} = 1357 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1221 . $source 1360 . $source
1222 . "\n};\n1"; 1361 . "\n};\n1";
1223 1362
1224 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1240 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1242 1381
1243 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1383 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1385 }
1248 1386
1249 warn $msg; 1387 warn $msg;
1250 } 1388 }
1251 1389
1265 1403
1266=back 1404=back
1267 1405
1268=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1269 1407
1270Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1271 1409
1272=cut 1410=cut
1273 1411
1274package cf::player; 1412package cf::player;
1275 1413
1318 1456
1319sub exists($) { 1457sub exists($) {
1320 my ($login) = @_; 1458 my ($login) = @_;
1321 1459
1322 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1324} 1462}
1325 1463
1326sub find($) { 1464sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1466 my $login = $_[0];
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1477
1340 my $f = new_from_file cf::object::thawer path $login 1478 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1479 or return;
1342 1480
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1481 my $pl = cf::player::load_pl $f
1345 or return; 1482 or return;
1483
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1484 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1485 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1349 } 1487 }
1350 } 1488 }
1360 1498
1361 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1362 1500
1363 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1364 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1503
1504 cf::get_slot 0.01;
1365 1505
1366 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1367 cf::cede_to_tick; 1507 cf::cede_to_tick;
1368} 1508}
1369 1509
1401 my ($pl) = @_; 1541 my ($pl) = @_;
1402 1542
1403 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1404 1544
1405 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1406 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1407 1547
1408 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1409 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1410 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1411 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1412 1554
1413 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1414 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1453 1595
1454 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1455 my $path = path $login; 1597 my $path = path $login;
1456 1598
1457 # a .pst is a dead give-away for a valid player 1599 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") { 1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1460 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1461 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 } 1605 }
1463 1606
1494 } 1637 }
1495 1638
1496 \@paths 1639 \@paths
1497} 1640}
1498 1641
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1500 1643
1501Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549 1645
1550=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1551 1647
1552Sends an ext reply to the player. 1648Sends an ext reply to the player.
1553 1649
1620our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1621our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1622 1718
1623sub generate_random_map { 1719sub generate_random_map {
1624 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1625 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1626 $self->_create_random_map ( 1725 $self->_create_random_map (
1627 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1628 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1629 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1751 1850
1752# the temporary/swap location 1851# the temporary/swap location
1753sub save_path { 1852sub save_path {
1754 my ($self) = @_; 1853 my ($self) = @_;
1755 1854
1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1757 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1758} 1857}
1759 1858
1760# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1761sub uniq_path { 1860sub uniq_path {
1762 my ($self) = @_; 1861 my ($self) = @_;
1763 1862
1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1765 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1766}
1767
1768# and all this just because we cannot iterate over
1769# all maps in C++...
1770sub change_all_map_light {
1771 my ($change) = @_;
1772
1773 $_->change_map_light ($change)
1774 for grep $_->outdoor, values %cf::MAP;
1775} 1865}
1776 1866
1777sub decay_objects { 1867sub decay_objects {
1778 my ($self) = @_; 1868 my ($self) = @_;
1779 1869
1863sub find { 1953sub find {
1864 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1865 1955
1866 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1867 1957
1868 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1869 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1870 1960
1871 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1875 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1876 or return; 1963 or return;
1877 1964
1878 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1879 1966
1881 or return; 1968 or return;
1882 1969
1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1884 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1885 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1886 undef $guard1; 1974 undef $guard1;
1887 undef $guard2;
1888 $map->reset; 1975 $map->reset;
1889 return find $path; 1976 return find $path;
1890 } 1977 }
1891 1978
1892 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1919 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block; 2007 $f->skip_block;
1921 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
1922 or return; 2009 or return;
1923 2010
1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1925 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1926 2013
1927 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1928 utf8::encode $uniq; 2015 utf8::encode $uniq;
1929 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
1947 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1948 $self->decay_objects; 2035 $self->decay_objects;
1949 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1950 $self->update_buttons; 2037 $self->update_buttons;
1951 cf::cede_to_tick; 2038 cf::cede_to_tick;
1952 $self->set_darkness_map;
1953 cf::cede_to_tick;
1954 $self->activate; 2039 $self->activate;
1955 } 2040 }
1956 2041
1957 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME); 2043 $self->last_access ($cf::RUNTIME);
1959 2044
1960 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
1961 } 2046 }
1962 2047
1963 $self->post_load; 2048 $self->post_load;
1964} 2049}
1965 2050
2023 my ($path, $origin, $load) = @_; 2108 my ($path, $origin, $load) = @_;
2024 2109
2025 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
2026 2111
2027 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2029 } 2114 }
2030 2115
2031 $MAP_PREFETCH{$path} |= $load; 2116 $MAP_PREFETCH{$path} |= $load;
2032 2117
2033 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2119 $Coro::current->{desc} = "map prefetcher";
2120
2034 while (%MAP_PREFETCH) { 2121 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2122 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2123 if (my $map = find $k) {
2037 $map->load if $v; 2124 $map->load if $v;
2038 } 2125 }
2064 return if $self->{deny_save}; 2151 return if $self->{deny_save};
2065 2152
2066 local $self->{last_access} = $self->last_access;#d# 2153 local $self->{last_access} = $self->last_access;#d#
2067 2154
2068 cf::async { 2155 cf::async {
2156 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
2070 }; 2158 };
2159
2160 cf::get_slot 0.02;
2071 2161
2072 if ($uniq) { 2162 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2074 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2075 } else { 2165 } else {
2084 $self->save; 2174 $self->save;
2085 2175
2086 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2087 2177
2088 return if $self->players; 2178 return if $self->players;
2089 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
2090 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2091 2181
2092 $self->in_memory (cf::MAP_SWAPPED); 2182 $self->in_memory (cf::MAP_SWAPPED);
2093 2183
2094 $self->deactivate; 2184 $self->deactivate;
2212 2302
2213sub unique_maps() { 2303sub unique_maps() {
2214 [ 2304 [
2215 map { 2305 map {
2216 utf8::decode $_; 2306 utf8::decode $_;
2217 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
2218 ? normalise $_ 2310 : normalise $_
2219 : ()
2220 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
2221 ] 2312 ]
2222} 2313}
2223 2314
2224package cf;
2225
2226=back 2315=back
2227 2316
2228=head3 cf::object 2317=head3 cf::object
2229 2318
2230=cut 2319=cut
2233 2322
2234=over 4 2323=over 4
2235 2324
2236=item $ob->inv_recursive 2325=item $ob->inv_recursive
2237 2326
2238Returns the inventory of the object _and_ their inventories, recursively. 2327Returns the inventory of the object I<and> their inventories, recursively,
2328but I<not> the object itself.
2239 2329
2240=cut 2330=cut
2241 2331
2242sub inv_recursive_; 2332sub inv_recursive_;
2243sub inv_recursive_ { 2333sub inv_recursive_ {
2248 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2249} 2339}
2250 2340
2251=item $ref = $ob->ref 2341=item $ref = $ob->ref
2252 2342
2253creates and returns a persistent reference to an objetc that can be stored as a string. 2343Creates and returns a persistent reference to an object that can be stored as a string.
2254 2344
2255=item $ob = cf::object::deref ($refstring) 2345=item $ob = cf::object::deref ($refstring)
2256 2346
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block. 2348even if the object actually exists. May block.
2260=cut 2350=cut
2261 2351
2262sub deref { 2352sub deref {
2263 my ($ref) = @_; 2353 my ($ref) = @_;
2264 2354
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2356 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2358 or return;
2272 $pl->ob->uuid eq $uuid 2359 $pl->ob->uuid eq $uuid
2273 or return; 2360 or return;
2293can be C<undef>. Does the right thing when the player is currently in a 2380can be C<undef>. Does the right thing when the player is currently in a
2294dialogue with the given NPC character. 2381dialogue with the given NPC character.
2295 2382
2296=cut 2383=cut
2297 2384
2385our $SAY_CHANNEL = {
2386 id => "say",
2387 title => "Map",
2388 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2390};
2391
2392our $CHAT_CHANNEL = {
2393 id => "chat",
2394 title => "Chat",
2395 reply => "chat ",
2396 tooltip => "Player chat and shouts, global to the server.",
2397};
2398
2298# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2299# with dialog boxes. 2400# with dialog boxes.
2300#TODO: the first argument must go, split into a $npc->reply_to ( method 2401#TODO: the first argument must go, split into a $npc->reply_to ( method
2301sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2302 my ($self, $npc, $msg, $flags) = @_; 2403 my ($self, $npc, $msg, $flags) = @_;
2313 my $dialog = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2315 2416
2316 } else { 2417 } else {
2317 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2318 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2319 } 2420 }
2320 } 2421 }
2321} 2422}
2322 2423
2323=item $object->send_msg ($channel, $msg, $color, [extra...]) 2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2348 2449
2349=item $player_object->enter_link 2450=item $player_object->enter_link
2350 2451
2351Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2352 2453
2353The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2354I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2355 2458
2356Will never block. 2459Will never block.
2357 2460
2358=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2359 2462
2417 2520
2418 $map->load; 2521 $map->load;
2419 $map->load_neighbours; 2522 $map->load_neighbours;
2420 2523
2421 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2422 $self->activate_recursive; 2526 $self->activate_recursive;
2423 2527
2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2425 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2426} 2530}
2431her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2432that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2433the new (success) or old (failed) map position. In either case, $done will 2537the new (success) or old (failed) map position. In either case, $done will
2434be called at the end of this process. 2538be called at the end of this process.
2435 2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2542
2436=cut 2543=cut
2437 2544
2438our $GOTOGEN; 2545our $GOTOGEN;
2439 2546
2440sub cf::object::player::goto { 2547sub cf::object::player::goto {
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2552
2446 $self->enter_link; 2553 $self->enter_link;
2447 2554
2448 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
2449 my $map = eval { 2577 my $map = eval {
2450 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2451 2579
2452 if ($map) { 2580 if ($map) {
2453 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2455 } else { 2583 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2585 }
2458 2586
2459 $map 2587 $map
2460 }; 2588 };
2461 2589
2497} 2625}
2498 2626
2499sub prepare_random_map { 2627sub prepare_random_map {
2500 my ($exit) = @_; 2628 my ($exit) = @_;
2501 2629
2502 my $guard = cf::lock_acquire "exit_prepare:$exit";
2503
2504 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2505 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2506 # that depends on the exit object 2632 # that depends on the exit object
2507 2633
2508 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
2510 if ($exit->map) { 2636 if ($exit->map) {
2511 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2512 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2513 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2514 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2515 } 2643 }
2516 2644
2517 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2518 2646
2519 my $data = cf::to_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2520 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2522 2650
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2525 undef $fh; 2653 undef $fh;
2526 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2527 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2528 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2529 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2530 } 2662 }
2531} 2663}
2532 2664
2533sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2534 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2535 2667
2536 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2537 2669
2538 if ($exit->slaying eq "/!") {
2539 #TODO: this should de-fi-ni-te-ly not be a sync-job
2540 # the problem is that $exit might not survive long enough
2541 # so it needs to be done right now, right here
2542 cf::sync_job { prepare_random_map $exit };
2543 }
2544
2545 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2546 my $hp = $exit->stats->hp;
2547 my $sp = $exit->stats->sp;
2548
2549 $self->enter_link; 2670 $self->enter_link;
2550 2671
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2554
2555 (async { 2672 (async {
2556 $self->deactivate_recursive; # just to be sure 2673 $Coro::current->{desc} = "enter_exit";
2674
2557 unless (eval { 2675 unless (eval {
2676 $self->deactivate_recursive; # just to be sure
2677
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2687 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp;
2689
2558 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2559 2691
2692 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y)
2694 if $exit->flag (cf::FLAG_DAMNED);
2695
2560 1; 2696 1
2561 }) { 2697 }) {
2562 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2563 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2564 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2565 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2566 2702
2567 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
2595the message, with C<log> being the default. If C<$color> is negative, suppress 2731the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet. 2732the message unless the client supports the msg packet.
2597 2733
2598=cut 2734=cut
2599 2735
2736# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2737our %CHANNEL = (
2601 "c/identify" => { 2738 "c/identify" => {
2602 id => "identify", 2739 id => "infobox",
2603 title => "Identify", 2740 title => "Identify",
2604 reply => undef, 2741 reply => undef,
2605 tooltip => "Items recently identified", 2742 tooltip => "Items recently identified",
2606 }, 2743 },
2607 "c/examine" => { 2744 "c/examine" => {
2608 id => "examine", 2745 id => "infobox",
2609 title => "Examine", 2746 title => "Examine",
2610 reply => undef, 2747 reply => undef,
2611 tooltip => "Signs and other items you examined", 2748 tooltip => "Signs and other items you examined",
2612 }, 2749 },
2750 "c/book" => {
2751 id => "infobox",
2752 title => "Book",
2753 reply => undef,
2754 tooltip => "The contents of a note or book",
2755 },
2756 "c/lookat" => {
2757 id => "infobox",
2758 title => "Look",
2759 reply => undef,
2760 tooltip => "What you saw there",
2761 },
2762 "c/who" => {
2763 id => "infobox",
2764 title => "Players",
2765 reply => undef,
2766 tooltip => "Shows players who are currently online",
2767 },
2768 "c/body" => {
2769 id => "infobox",
2770 title => "Body Parts",
2771 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available",
2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2780 "c/uptime" => {
2781 id => "infobox",
2782 title => "Uptime",
2783 reply => undef,
2784 tooltip => "How long the server has been running since last restart",
2785 },
2786 "c/mapinfo" => {
2787 id => "infobox",
2788 title => "Map Info",
2789 reply => undef,
2790 tooltip => "Information related to the maps",
2791 },
2792 "c/party" => {
2793 id => "party",
2794 title => "Party",
2795 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party",
2797 },
2798 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL,
2613); 2800);
2614 2801
2615sub cf::client::send_msg { 2802sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2804
2618 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2619 2807
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2809
2622 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2624 2813
2814 $self->ext_msg (channel_info => $channel);
2815 $channel = $channel->{id};
2816
2625 if (ref $channel) { 2817 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2818 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2819 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2820 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2821 $self->ext_msg (channel_info => $channel);
2630 if $self->can_msg;
2631 } 2822 }
2632 2823
2633 $channel = $channel->{id}; 2824 $channel = $channel->{id};
2634 } 2825 }
2635 2826
2636 return unless @extra || length $msg; 2827 return unless @extra || length $msg;
2637 2828
2638 if ($self->can_msg) {
2639 # default colour, mask it out 2829 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2830 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF; 2831 if $color & cf::NDI_DEF;
2642 2832
2643 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2833 my $pkt = "msg "
2834 . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2835 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2645 } else { 2836 );
2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656 2837
2657 $color &= cf::NDI_COLOR_MASK; 2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2658 2841
2659 utf8::encode $msg; 2842 # split very large packets
2660 2843 if (8192 < length $pkt and $self->{can_lzf}) {
2661 if (0 && $msg =~ /\[/) { 2844 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2662 # COMMAND/INFO 2845 $pkt = "frag";
2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2664 } else {
2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2666 $self->send_packet ("drawinfo $color $msg")
2667 }
2668 }
2669 } 2846 }
2847
2848 $self->send_packet ($pkt);
2670} 2849}
2671 2850
2672=item $client->ext_msg ($type, @msg) 2851=item $client->ext_msg ($type, @msg)
2673 2852
2674Sends an ext event to the client. 2853Sends an ext event to the client.
2847=pod 3026=pod
2848 3027
2849The following functions and methods are available within a safe environment: 3028The following functions and methods are available within a safe environment:
2850 3029
2851 cf::object 3030 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 3031 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 3032 insert remove name archname title slaying race decrease split
2854 3033
2855 cf::object::player 3034 cf::object::player
2856 player 3035 player
2857 3036
2858 cf::player 3037 cf::player
2863 3042
2864=cut 3043=cut
2865 3044
2866for ( 3045for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3046 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 3047 insert remove inv nrof name archname title slaying race
2869 decrease_ob_nr)], 3048 decrease split destroy change_exp)],
2870 ["cf::object::player" => qw(player)], 3049 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3050 ["cf::player" => qw(peaceful)],
2872 ["cf::map" => qw(trigger)], 3051 ["cf::map" => qw(trigger)],
2873) { 3052) {
2874 no strict 'refs'; 3053 no strict 'refs';
2979 { 3158 {
2980 my $faces = $facedata->{faceinfo}; 3159 my $faces = $facedata->{faceinfo};
2981 3160
2982 while (my ($face, $info) = each %$faces) { 3161 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3162 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3163
2984 cf::face::set_visibility $idx, $info->{visibility}; 3164 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3165 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3166 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3167 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2988 3168
2989 cf::cede_to_tick; 3169 cf::cede_to_tick;
2990 } 3170 }
2991 3171
2992 while (my ($face, $info) = each %$faces) { 3172 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3173 next unless $info->{smooth};
3174
2994 my $idx = cf::face::find $face 3175 my $idx = cf::face::find $face
2995 or next; 3176 or next;
3177
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3178 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3179 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3180 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3181 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3182 warn "smooth face '$info->{smooth}' not found for face '$face'";
3018 { 3200 {
3019 # TODO: for gcfclient pleasure, we should give resources 3201 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index. 3202 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3203 my $res = $facedata->{resource};
3022 3204
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3205 while (my ($name, $info) = each %$res) {
3206 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3207 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data; 3208 my $data;
3028 3209
3029 if ($info->{type} & 1) { 3210 if ($info->{type} & 1) {
3030 # prepend meta info 3211 # prepend meta info
3031 3212
3032 my $meta = $enc->encode ({ 3213 my $meta = $enc->encode ({
3033 name => $name, 3214 name => $name,
3034 %{ $info->{meta} || {} }, 3215 %{ $info->{meta} || {} },
3035 }); 3216 });
3036 3217
3037 $data = pack "(w/a*)*", $meta, $info->{data}; 3218 $data = pack "(w/a*)*", $meta, $info->{data};
3219 } else {
3220 $data = $info->{data};
3221 }
3222
3223 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3224 cf::face::set_type $idx, $info->{type};
3038 } else { 3225 } else {
3039 $data = $info->{data}; 3226 $RESOURCE{$name} = $info;
3040 } 3227 }
3041 3228
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick; 3229 cf::cede_to_tick;
3046 } 3230 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 } 3231 }
3232
3233 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3234
3067 1 3235 1
3068} 3236}
3237
3238cf::global->attach (on_resource_update => sub {
3239 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3240 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3241
3242 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3243 my $sound = $soundconf->{compat}[$_]
3244 or next;
3245
3246 my $face = cf::face::find "sound/$sound->[1]";
3247 cf::sound::set $sound->[0] => $face;
3248 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3249 }
3250
3251 while (my ($k, $v) = each %{$soundconf->{event}}) {
3252 my $face = cf::face::find "sound/$v";
3253 cf::sound::set $k => $face;
3254 }
3255 }
3256});
3069 3257
3070register_exticmd fx_want => sub { 3258register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_; 3259 my ($ns, $want) = @_;
3072 3260
3073 while (my ($k, $v) = each %$want) { 3261 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v); 3262 $ns->fx_want ($k, $v);
3075 } 3263 }
3076}; 3264};
3265
3266sub load_resource_file($) {
3267 my $guard = lock_acquire "load_resource_file";
3268
3269 my $status = load_resource_file_ $_[0];
3270 get_slot 0.1, 100;
3271 cf::arch::commit_load;
3272
3273 $status
3274}
3077 3275
3078sub reload_regions { 3276sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework 3277 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?) 3278 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = (); 3279 %ext::player_env::MUSIC_FACE_CACHE = ();
3095} 3293}
3096 3294
3097sub reload_archetypes { 3295sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes" 3296 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n"; 3297 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
3103 load_resource_file "$DATADIR/archetypes"
3104 or die "unable to load archetypes\n";
3105} 3298}
3106 3299
3107sub reload_treasures { 3300sub reload_treasures {
3108 load_resource_file "$DATADIR/treasures" 3301 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n"; 3302 or die "unable to load treasurelists\n";
3110} 3303}
3111 3304
3112sub reload_resources { 3305sub reload_resources {
3113 warn "reloading resource files...\n"; 3306 warn "reloading resource files...\n";
3114 3307
3308 reload_facedata;
3309 reload_archetypes;
3115 reload_regions; 3310 reload_regions;
3116 reload_facedata;
3117 #reload_archetypes;#d#
3118 reload_archetypes;
3119 reload_treasures; 3311 reload_treasures;
3120 3312
3121 warn "finished reloading resource files\n"; 3313 warn "finished reloading resource files\n";
3122}
3123
3124sub init {
3125 reload_resources;
3126} 3314}
3127 3315
3128sub reload_config { 3316sub reload_config {
3129 open my $fh, "<:utf8", "$CONFDIR/config" 3317 open my $fh, "<:utf8", "$CONFDIR/config"
3130 or return; 3318 or return;
3131 3319
3132 local $/; 3320 local $/;
3133 *CFG = YAML::Syck::Load <$fh>; 3321 *CFG = YAML::Load <$fh>;
3134 3322
3135 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3323 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3136 3324
3137 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3325 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3138 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3326 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3144 }; 3332 };
3145 warn $@ if $@; 3333 warn $@ if $@;
3146 } 3334 }
3147} 3335}
3148 3336
3337sub pidfile() {
3338 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3339 or die "$PIDFILE: $!";
3340 flock $fh, &Fcntl::LOCK_EX
3341 or die "$PIDFILE: flock: $!";
3342 $fh
3343}
3344
3345# make sure only one server instance is running at any one time
3346sub atomic {
3347 my $fh = pidfile;
3348
3349 my $pid = <$fh>;
3350 kill 9, $pid if $pid > 0;
3351
3352 seek $fh, 0, 0;
3353 print $fh $$;
3354}
3355
3149sub main { 3356sub main {
3357 cf::init_globals; # initialise logging
3358
3359 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3360 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3361 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3362 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3363
3364 cf::init_experience;
3365 cf::init_anim;
3366 cf::init_attackmess;
3367 cf::init_dynamic;
3368
3369 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3370
3150 # we must not ever block the main coroutine 3371 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3372 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3373 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3374 (async {
3154 Event::one_event; 3375 $Coro::current->{desc} = "IDLE BUG HANDLER";
3376 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3377 })->prio (Coro::PRIO_MAX);
3156 }; 3378 };
3157 3379
3380 evthread_start IO::AIO::poll_fileno;
3381
3382 cf::sync_job {
3383 reload_resources;
3158 reload_config; 3384 reload_config;
3159 db_init; 3385 db_init;
3386
3387 cf::load_settings;
3388 cf::load_materials;
3389 cf::init_uuid;
3390 cf::init_signals;
3391 cf::init_commands;
3392 cf::init_skills;
3393
3394 cf::init_beforeplay;
3395
3396 atomic;
3397
3160 load_extensions; 3398 load_extensions;
3161 3399
3162 $TICK_WATCHER->start; 3400 utime time, time, $RUNTIMEFILE;
3401
3402 # no (long-running) fork's whatsoever before this point(!)
3403 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3404
3405 (pop @POST_INIT)->(0) while @POST_INIT;
3406 };
3407
3163 Event::loop; 3408 EV::loop;
3164} 3409}
3165 3410
3166############################################################################# 3411#############################################################################
3167# initialisation and cleanup 3412# initialisation and cleanup
3168 3413
3169# install some emergency cleanup handlers 3414# install some emergency cleanup handlers
3170BEGIN { 3415BEGIN {
3416 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3417 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3418 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3419 cf::cleanup "SIG$signal";
3179 },
3180 ); 3420 };
3181 } 3421 }
3182} 3422}
3183 3423
3184sub write_runtime { 3424sub write_runtime_sync {
3185 my $runtime = "$LOCALDIR/runtime";
3186
3187 # first touch the runtime file to show we are still running: 3425 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time. 3426 # the fsync below can take a very very long time.
3189 3427
3190 IO::AIO::aio_utime $runtime, undef, undef; 3428 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3191 3429
3192 my $guard = cf::lock_acquire "write_runtime"; 3430 my $guard = cf::lock_acquire "write_runtime";
3193 3431
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3432 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3195 or return; 3433 or return;
3196 3434
3197 my $value = $cf::RUNTIME + 90 + 10; 3435 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock 3436 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server. 3437 # 60 allows for the watchdog to kill the server.
3209 aio_utime $fh, undef, undef; 3447 aio_utime $fh, undef, undef;
3210 3448
3211 close $fh 3449 close $fh
3212 or return; 3450 or return;
3213 3451
3214 aio_rename "$runtime~", $runtime 3452 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3215 and return; 3453 and return;
3216 3454
3217 warn "runtime file written.\n"; 3455 warn "runtime file written.\n";
3218 3456
3219 1 3457 1
3458}
3459
3460our $uuid_lock;
3461our $uuid_skip;
3462
3463sub write_uuid_sync($) {
3464 $uuid_skip ||= $_[0];
3465
3466 return if $uuid_lock;
3467 local $uuid_lock = 1;
3468
3469 my $uuid = "$LOCALDIR/uuid";
3470
3471 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3472 or return;
3473
3474 my $value = uuid_seq uuid_cur;
3475
3476 unless ($value) {
3477 warn "cowardly refusing to write zero uuid value!\n";
3478 return;
3479 }
3480
3481 my $value = uuid_str $value + $uuid_skip;
3482 $uuid_skip = 0;
3483
3484 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3485 and return;
3486
3487 # always fsync - this file is important
3488 aio_fsync $fh
3489 and return;
3490
3491 close $fh
3492 or return;
3493
3494 aio_rename "$uuid~", $uuid
3495 and return;
3496
3497 warn "uuid file written ($value).\n";
3498
3499 1
3500
3501}
3502
3503sub write_uuid($$) {
3504 my ($skip, $sync) = @_;
3505
3506 $sync ? write_uuid_sync $skip
3507 : async { write_uuid_sync $skip };
3220} 3508}
3221 3509
3222sub emergency_save() { 3510sub emergency_save() {
3223 my $freeze_guard = cf::freeze_mainloop; 3511 my $freeze_guard = cf::freeze_mainloop;
3224 3512
3225 warn "enter emergency perl save\n"; 3513 warn "emergency_perl_save: enter\n";
3226 3514
3227 cf::sync_job { 3515 cf::sync_job {
3516 # this is a trade-off: we want to be very quick here, so
3517 # save all maps without fsync, and later call a global sync
3518 # (which in turn might be very very slow)
3519 local $USE_FSYNC = 0;
3520
3228 # use a peculiar iteration method to avoid tripping on perl 3521 # use a peculiar iteration method to avoid tripping on perl
3229 # refcount bugs in for. also avoids problems with players 3522 # refcount bugs in for. also avoids problems with players
3230 # and maps saved/destroyed asynchronously. 3523 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3524 warn "emergency_perl_save: begin player save\n";
3232 for my $login (keys %cf::PLAYER) { 3525 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3526 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3527 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3529 $pl->save;
3236 } 3530 }
3237 warn "end emergency player save\n"; 3531 warn "emergency_perl_save: end player save\n";
3238 3532
3239 warn "begin emergency map save\n"; 3533 warn "emergency_perl_save: begin map save\n";
3240 for my $path (keys %cf::MAP) { 3534 for my $path (keys %cf::MAP) {
3241 my $map = $cf::MAP{$path} or next; 3535 my $map = $cf::MAP{$path} or next;
3242 $map->valid or next; 3536 $map->valid or next;
3243 $map->save; 3537 $map->save;
3244 } 3538 }
3245 warn "end emergency map save\n"; 3539 warn "emergency_perl_save: end map save\n";
3246 3540
3247 warn "begin emergency database checkpoint\n"; 3541 warn "emergency_perl_save: begin database checkpoint\n";
3248 BDB::db_env_txn_checkpoint $DB_ENV; 3542 BDB::db_env_txn_checkpoint $DB_ENV;
3249 warn "end emergency database checkpoint\n"; 3543 warn "emergency_perl_save: end database checkpoint\n";
3544
3545 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1;
3547 warn "emergency_perl_save: end write uuid\n";
3250 }; 3548 };
3251 3549
3550 warn "emergency_perl_save: starting sync()\n";
3551 IO::AIO::aio_sync sub {
3552 warn "emergency_perl_save: finished sync()\n";
3553 };
3554
3252 warn "leave emergency perl save\n"; 3555 warn "emergency_perl_save: leave\n";
3253} 3556}
3254 3557
3255sub post_cleanup { 3558sub post_cleanup {
3256 my ($make_core) = @_; 3559 my ($make_core) = @_;
3257 3560
3258 warn Carp::longmess "post_cleanup backtrace" 3561 warn Carp::longmess "post_cleanup backtrace"
3259 if $make_core; 3562 if $make_core;
3563
3564 my $fh = pidfile;
3565 unlink $PIDFILE if <$fh> == $$;
3566}
3567
3568# a safer delete_package, copied from Symbol
3569sub clear_package($) {
3570 my $pkg = shift;
3571
3572 # expand to full symbol table name if needed
3573 unless ($pkg =~ /^main::.*::$/) {
3574 $pkg = "main$pkg" if $pkg =~ /^::/;
3575 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3576 $pkg .= '::' unless $pkg =~ /::$/;
3577 }
3578
3579 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3580 my $stem_symtab = *{$stem}{HASH};
3581
3582 defined $stem_symtab and exists $stem_symtab->{$leaf}
3583 or return;
3584
3585 # clear all symbols
3586 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3587 for my $name (keys %$leaf_symtab) {
3588 _gv_clear *{"$pkg$name"};
3589# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3590 }
3591 warn "cleared package $pkg\n";#d#
3260} 3592}
3261 3593
3262sub do_reload_perl() { 3594sub do_reload_perl() {
3263 # can/must only be called in main 3595 # can/must only be called in main
3264 if ($Coro::current != $Coro::main) { 3596 if ($Coro::current != $Coro::main) {
3265 warn "can only reload from main coroutine"; 3597 warn "can only reload from main coroutine";
3266 return; 3598 return;
3267 } 3599 }
3268 3600
3601 return if $RELOAD++;
3602
3603 my $t1 = EV::time;
3604
3605 while ($RELOAD) {
3269 warn "reloading..."; 3606 warn "reloading...";
3270 3607
3271 warn "entering sync_job"; 3608 warn "entering sync_job";
3272 3609
3273 cf::sync_job { 3610 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark 3611 cf::write_runtime_sync; # external watchdog should not bark
3275 cf::emergency_save; 3612 cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark 3613 cf::write_runtime_sync; # external watchdog should not bark
3277 3614
3278 warn "syncing database to disk"; 3615 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3616 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3617
3281 # if anything goes wrong in here, we should simply crash as we already saved 3618 # if anything goes wrong in here, we should simply crash as we already saved
3282 3619
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287
3288 warn "flushing outstanding aio requests"; 3620 warn "flushing outstanding aio requests";
3289 for (;;) {
3290 BDB::flush;
3291 IO::AIO::flush;
3292 Coro::cede;
3293 last unless IO::AIO::nreqs || BDB::nreqs; 3621 while (IO::AIO::nreqs || BDB::nreqs) {
3294 warn "iterate..."; 3622 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3295 }
3296
3297 ++$RELOAD;
3298
3299 warn "cancelling all extension coros";
3300 $_->cancel for values %EXT_CORO;
3301 %EXT_CORO = ();
3302
3303 warn "removing commands";
3304 %COMMAND = ();
3305
3306 warn "removing ext/exti commands";
3307 %EXTCMD = ();
3308 %EXTICMD = ();
3309
3310 warn "unloading/nuking all extensions";
3311 for my $pkg (@EXTS) {
3312 warn "... unloading $pkg";
3313
3314 if (my $cb = $pkg->can ("unload")) {
3315 eval {
3316 $cb->($pkg);
3317 1
3318 } or warn "$pkg unloaded, but with errors: $@";
3319 } 3623 }
3320 3624
3321 warn "... nuking $pkg"; 3625 warn "cancelling all extension coros";
3322 Symbol::delete_package $pkg; 3626 $_->cancel for values %EXT_CORO;
3323 } 3627 %EXT_CORO = ();
3324 3628
3325 warn "unloading all perl modules loaded from $LIBDIR"; 3629 warn "removing commands";
3326 while (my ($k, $v) = each %INC) { 3630 %COMMAND = ();
3327 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3328 3631
3632 warn "removing ext/exti commands";
3633 %EXTCMD = ();
3634 %EXTICMD = ();
3635
3636 warn "unloading/nuking all extensions";
3637 for my $pkg (@EXTS) {
3329 warn "... unloading $k"; 3638 warn "... unloading $pkg";
3330 delete $INC{$k};
3331 3639
3332 $k =~ s/\.pm$//;
3333 $k =~ s/\//::/g;
3334
3335 if (my $cb = $k->can ("unload_module")) { 3640 if (my $cb = $pkg->can ("unload")) {
3641 eval {
3336 $cb->(); 3642 $cb->($pkg);
3643 1
3644 } or warn "$pkg unloaded, but with errors: $@";
3645 }
3646
3647 warn "... clearing $pkg";
3648 clear_package $pkg;
3337 } 3649 }
3338 3650
3339 Symbol::delete_package $k; 3651 warn "unloading all perl modules loaded from $LIBDIR";
3652 while (my ($k, $v) = each %INC) {
3653 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3654
3655 warn "... unloading $k";
3656 delete $INC{$k};
3657
3658 $k =~ s/\.pm$//;
3659 $k =~ s/\//::/g;
3660
3661 if (my $cb = $k->can ("unload_module")) {
3662 $cb->();
3663 }
3664
3665 clear_package $k;
3340 } 3666 }
3341 3667
3342 warn "getting rid of safe::, as good as possible"; 3668 warn "getting rid of safe::, as good as possible";
3343 Symbol::delete_package "safe::$_" 3669 clear_package "safe::$_"
3344 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3670 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3345 3671
3346 warn "unloading cf.pm \"a bit\""; 3672 warn "unloading cf.pm \"a bit\"";
3347 delete $INC{"cf.pm"}; 3673 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"}; 3674 delete $INC{"cf/pod.pm"};
3349 3675
3350 # don't, removes xs symbols, too, 3676 # don't, removes xs symbols, too,
3351 # and global variables created in xs 3677 # and global variables created in xs
3352 #Symbol::delete_package __PACKAGE__; 3678 #clear_package __PACKAGE__;
3353 3679
3354 warn "unload completed, starting to reload now"; 3680 warn "unload completed, starting to reload now";
3355 3681
3356 warn "reloading cf.pm"; 3682 warn "reloading cf.pm";
3357 require cf; 3683 require cf;
3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3684 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3359 3685
3360 warn "loading config and database again"; 3686 warn "loading config and database again";
3361 cf::reload_config; 3687 cf::reload_config;
3362 3688
3363 warn "loading extensions"; 3689 warn "loading extensions";
3364 cf::load_extensions; 3690 cf::load_extensions;
3365 3691
3692 if ($REATTACH_ON_RELOAD) {
3366 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3367 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3368 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3369 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3370 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3371 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3699 }
3372 3700
3701 warn "running post_init jobs";
3702 (pop @POST_INIT)->(1) while @POST_INIT;
3703
3373 warn "leaving sync_job"; 3704 warn "leaving sync_job";
3374 3705
3375 1 3706 1
3376 } or do { 3707 } or do {
3377 warn $@; 3708 warn $@;
3378 warn "error while reloading, exiting."; 3709 cf::cleanup "error while reloading, exiting.";
3379 exit 1;
3380 }; 3710 };
3381 3711
3382 warn "reloaded"; 3712 warn "reloaded";
3713 --$RELOAD;
3714 }
3715
3716 $t1 = EV::time - $t1;
3717 warn "reload completed in ${t1}s\n";
3383}; 3718};
3384 3719
3385our $RELOAD_WATCHER; # used only during reload 3720our $RELOAD_WATCHER; # used only during reload
3386 3721
3387sub reload_perl() { 3722sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3723 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3724 # coro crashes during coro_state_free->destroy here.
3390 3725
3391 $RELOAD_WATCHER ||= Event->timer ( 3726 $RELOAD_WATCHER ||= cf::async {
3392 reentrant => 0, 3727 Coro::AIO::aio_wait cache_extensions;
3393 after => 0, 3728
3394 data => WF_AUTOCANCEL, 3729 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3395 cb => sub {
3396 do_reload_perl; 3730 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3731 undef $RELOAD_WATCHER;
3398 }, 3732 };
3399 ); 3733 };
3400} 3734}
3401 3735
3402register_command "reload" => sub { 3736register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3737 my ($who, $arg) = @_;
3404 3738
3405 if ($who->flag (FLAG_WIZ)) { 3739 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3740 $who->message ("reloading server.");
3741 async {
3742 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3743 reload_perl;
3744 };
3408 } 3745 }
3409}; 3746};
3410 3747
3411unshift @INC, $LIBDIR; 3748unshift @INC, $LIBDIR;
3412 3749
3414 3751
3415our @WAIT_FOR_TICK; 3752our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN; 3753our @WAIT_FOR_TICK_BEGIN;
3417 3754
3418sub wait_for_tick { 3755sub wait_for_tick {
3419 return unless $TICK_WATCHER->is_active;
3420 return if $Coro::current == $Coro::main; 3756 return if tick_inhibit || $Coro::current == $Coro::main;
3421 3757
3422 my $signal = new Coro::Signal; 3758 my $signal = new Coro::Signal;
3423 push @WAIT_FOR_TICK, $signal; 3759 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait; 3760 $signal->wait;
3425} 3761}
3426 3762
3427sub wait_for_tick_begin { 3763sub wait_for_tick_begin {
3428 return unless $TICK_WATCHER->is_active;
3429 return if $Coro::current == $Coro::main; 3764 return if tick_inhibit || $Coro::current == $Coro::main;
3430 3765
3431 my $signal = new Coro::Signal; 3766 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3767 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3768 $signal->wait;
3434} 3769}
3435 3770
3436 my $min = 1e6;#d# 3771sub tick {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 3772 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3773 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3774 unless ++$bug_warning > 10;
3448 return; 3775 return;
3449 } 3776 }
3450 3777
3451 $NOW = $tick_start = Event::time;
3452
3453 cf::server_tick; # one server iteration 3778 cf::server_tick; # one server iteration
3454 3779
3455 0 && sync_job {#d# 3780 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3456 for(1..10) { 3781 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3457 my $t = Event::time; 3782 Coro::async_pool {
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3783 $Coro::current->{desc} = "runtime saver";
3459 or die; 3784 write_runtime_sync
3460 3785 or warn "ERROR: unable to write runtime file: $!";
3461 $map->width (50);
3462 $map->height (50);
3463 $map->alloc;
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3465 my $t = Event::time - $t;
3466
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 3786 };
3787 }
3477 3788
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3789 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3790 $sig->send;
3494 } 3791 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3792 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3793 $sig->send;
3497 } 3794 }
3498 3795
3499 $NOW = Event::time; 3796 $LOAD = ($NOW - $TICK_START) / $TICK;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3797 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3798
3510 _post_tick; 3799 if (0) {
3511 3800 if ($NEXT_TICK) {
3512 3801 my $jitter = $TICK_START - $NEXT_TICK;
3802 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3803 warn "jitter $JITTER\n";#d#
3804 }
3513 }, 3805 }
3514); 3806}
3515 3807
3516{ 3808{
3517 BDB::max_poll_time $TICK * 0.1; 3809 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 3810
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8; 3811 BDB::min_parallel 8;
3527 3812 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 3813 $AnyEvent::BDB::WATCHER->priority (1);
3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542 3814
3543 unless ($DB_ENV) { 3815 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3816 $DB_ENV = BDB::db_env_create;
3817 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3818 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3819 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3820 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3821 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3822
3546 cf::sync_job { 3823 cf::sync_job {
3547 eval { 3824 eval {
3548 BDB::db_env_open 3825 BDB::db_env_open
3549 $DB_ENV, 3826 $DB_ENV,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3828 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3829 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3830 0666;
3554 3831
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3832 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 3833 };
3560 3834
3561 cf::cleanup "db_env_open(db): $@" if $@; 3835 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3836 };
3563 } 3837 }
3838
3839 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3840 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3841 };
3842 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3843 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3844 };
3845 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3846 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3847 };
3564} 3848}
3565 3849
3566{ 3850{
3851 # configure IO::AIO
3852
3567 IO::AIO::min_parallel 8; 3853 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 3854 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 3855 undef $AnyEvent::AIO::WATCHER;
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 3856}
3580 3857
3581my $_log_backtrace; 3858my $_log_backtrace;
3582 3859
3583sub _log_backtrace { 3860sub _log_backtrace {
3586 $msg =~ s/\n//; 3863 $msg =~ s/\n//;
3587 3864
3588 # limit the # of concurrent backtraces 3865 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 3866 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 3867 ++$_log_backtrace;
3868 my $perl_bt = Carp::longmess $msg;
3591 async { 3869 async {
3870 $Coro::current->{desc} = "abt $msg";
3871
3592 my @bt = fork_call { 3872 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 3873 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3874 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3875 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 3876 or die "addr2line: $!";
3604 } 3884 }
3605 3885
3606 @funcs 3886 @funcs
3607 }; 3887 };
3608 3888
3609 LOG llevInfo, "[ABT] $msg\n"; 3889 LOG llevInfo, "[ABT] $perl_bt\n";
3890 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3610 LOG llevInfo, "[ABT] $_\n" for @bt; 3891 LOG llevInfo, "[ABT] $_\n" for @bt;
3611 --$_log_backtrace; 3892 --$_log_backtrace;
3612 }; 3893 };
3613 } else { 3894 } else {
3614 LOG llevInfo, "[ABT] $msg\n"; 3895 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines