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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.464 by root, Thu Jan 1 18:35:48 2009 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.61 (); 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;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5; 56use Digest::MD5;
29use Fcntl; 57use Fcntl;
30use YAML::Syck (); 58use YAML ();
31use IO::AIO 2.32 (); 59use IO::AIO ();
32use Time::HiRes; 60use Time::HiRes;
33use Compress::LZF; 61use Compress::LZF;
34use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
35 65
36# configure various modules to our taste 66# configure various modules to our taste
37# 67#
38$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 76
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 78
51our %COMMAND = (); 79our %COMMAND = ();
52our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
55our %EXTCMD = (); 83our %EXTCMD = ();
56our %EXTICMD = (); 84our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
59 87
60our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 89our @EVENT;
62 90
63our $CONFDIR = confdir; 91our $CONFDIR = confdir;
64our $DATADIR = datadir; 92our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
74 106
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 109our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
82 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 115our $DB_ENV;
85 116
86our %CFG; 117our %CFG;
87 118
88our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 120our $RUNTIME;
121our $NOW;
90 122
91our %PLAYER; # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 124our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
94 126
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 129
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
100our $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)
101 138
102binmode STDOUT; 139binmode STDOUT;
103binmode STDERR; 140binmode STDERR;
104 141
105# read virtual server time, if available 142# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
110} 147}
111 148
112mkdir $_ 149mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 195
159The raw value load value from the last tick. 196The raw value load value from the last tick.
160 197
161=item %cf::CFG 198=item %cf::CFG
162 199
163Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 201from wherever your confdir points to.
165 202
166=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
167 204
168These 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
186 $msg .= "\n" 223 $msg .= "\n"
187 unless $msg =~ /\n$/; 224 unless $msg =~ /\n$/;
188 225
189 $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;
190 227
191 utf8::encode $msg;
192 LOG llevError, $msg; 228 LOG llevError, $msg;
193 }; 229 };
194} 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#?
195 246
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 257for my $pkg (qw(
207 cf::global cf::attachable 258 cf::global cf::attachable
208 cf::object cf::object::player 259 cf::object cf::object::player
209 cf::client cf::player 260 cf::client cf::player
210 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
211 cf::map cf::party cf::region 263 cf::party cf::region
212)) { 264)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 266}
216 267
217$Event::DIED = sub { 268$EV::DIED = sub {
218 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
219}; 270};
220 271
221############################################################################# 272#############################################################################
222 273
245 $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;
246 $d 297 $d
247 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
248} 299}
249 300
250=item $ref = cf::from_json $json 301=item $ref = cf::decode_json $json
251 302
252Converts a JSON string into the corresponding perl data structure. 303Converts a JSON string into the corresponding perl data structure.
253 304
254=item $json = cf::to_json $ref 305=item $json = cf::encode_json $ref
255 306
256Converts a perl data structure into its JSON representation. 307Converts a perl data structure into its JSON representation.
257 308
258=cut 309=cut
259 310
260our $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
261 312
262sub to_json ($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
263sub 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}
264 329
265=item cf::lock_wait $string 330=item cf::lock_wait $string
266 331
267Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
268 333
269=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
270 335
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
274returned. 339returned.
275 340
341Locks are *not* recursive, locking from the same coro twice results in a
342deadlocked coro.
343
276Lock names should begin with a unique identifier (for example, cf::map::find 344Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 345uses map_find and cf::map::load uses map_load).
278 346
279=item $locked = cf::lock_active $string 347=item $locked = cf::lock_active $string
280 348
281Return 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.
282 350
283=cut 351=cut
284 352
285our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
286 354
287sub lock_wait($) { 355sub lock_wait($) {
288 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 357}
296 358
297sub lock_acquire($) { 359sub lock_acquire($) {
298 my ($key) = @_; 360 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 361}
310 362
311sub lock_active($) { 363sub lock_active($) {
312 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 365}
316 366
317sub freeze_mainloop { 367sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
319 369
320 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
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
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
322 }; 431 }
323 $TICK_WATCHER->stop; 432};
324 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
325} 446}
326 447
327=item cf::async { BLOCK } 448=item cf::async { BLOCK }
328 449
329Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
334 455
335BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
336 457
337=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
338 459
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
341partly 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
342acceptable. 463acceptable.
343 464
344If 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
345the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
350 471
351sub sync_job(&) { 472sub sync_job(&) {
352 my ($job) = @_; 473 my ($job) = @_;
353 474
354 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 476 my $time = EV::time;
356 477
357 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
359 480
360 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 482
362 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
363 484
364 my $busy = 1; 485 my $busy = 1;
365 my @res; 486 my @res;
366 487
367 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 490 @res = eval { $job->() };
369 warn $@ if $@; 491 warn $@ if $@;
370 undef $busy; 492 undef $busy;
371 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
372 494
373 while ($busy) { 495 while ($busy) {
374 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
375 } 500 }
501 }
376 502
377 $time = Event::time - $time; 503 my $time = EV::time - $time;
378 504
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
383 506
384 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
385 } else { 508 } else {
386 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
387 510
412=item fork_call { }, $args 535=item fork_call { }, $args
413 536
414Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
418 541
419=cut 542=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 543
430sub fork_call(&@) { 544sub fork_call(&@) {
431 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
432 546
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 550
438 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 552 reset_signals;
452 local $SIG{__WARN__}; 553 &$cb
453 local $SIG{__DIE__}; 554 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 555
460 eval { 556 wantarray ? @res : $res[-1]
461 close $fh1; 557}
462 558
463 my @res = eval { $cb->(@args) }; 559=item $coin = coin_from_name $name
464 560
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 561=cut
466 close $fh2;
467 };
468 562
469 warn $@ if $@; 563our %coin_alias = (
470 _exit 0; 564 "silver" => "silvercoin",
471 } 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
472} 584}
473 585
474=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
475 587
476Returns a single value from the environment database. 588Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
479 591
480Stores 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
481data 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).
482 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
483=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}
484 618
485our $DB; 619our $DB;
486 620
487sub db_init { 621sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 622 cf::sync_job {
492 eval { 623 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 624 };
502} 625}
503 626
504sub db_get($$) { 627sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
506 629
556 if (1) { 679 if (1) {
557 $md5 = 680 $md5 =
558 join "\x00", 681 join "\x00",
559 $processversion, 682 $processversion,
560 map { 683 map {
561 Coro::cede; 684 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 686 } 0.. $#$src;
564 687
565 688
566 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
604 727
605############################################################################# 728#############################################################################
606 729
607=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
608 731
609Many 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
610attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
612 735
613In 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>
614C<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
615Crossfire TRT). 738Deliantra).
616 739
617=over 4 740=over 4
618 741
619=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
620 743
664=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
665 788
666Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
667given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
668 791
669Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
670that 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.
671 794
672These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
673 796
674=over 4 797=over 4
902 } 1025 }
903 1026
904 0 1027 0
905} 1028}
906 1029
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1031
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1033
911Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
912 1035
918 1041
919=cut 1042=cut
920 1043
921############################################################################# 1044#############################################################################
922# object support 1045# object support
923#
924 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#
925sub _can_merge { 1080sub _can_merge {
926 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
927 1082
928 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931 1084
932 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
933} 1087}
934 1088
935sub reattach { 1089sub reattach {
936 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
937 my ($obj) = @_; 1091 my ($obj) = @_;
938 1092
1093 # no longer needed after getting rid of delete_package?
939 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
940 1095
941 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
942 1097
943 @$registry = (); 1098 @$registry = ();
944 1099
959cf::attachable->attach ( 1114cf::attachable->attach (
960 prio => -1000000, 1115 prio => -1000000,
961 on_instantiate => sub { 1116 on_instantiate => sub {
962 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
963 1118
964 $data = from_json $data; 1119 $data = decode_json $data;
965 1120
966 for (@$data) { 1121 for (@$data) {
967 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
968 1123
969 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
985sub object_freezer_save { 1140sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
987 1142
988 sync_job { 1143 sync_job {
989 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
992 1148
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
997 close $fh; 1153 aio_close $fh;
998 1154
999 if (@$objs) { 1155 if (@$objs) {
1000 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) {
1001 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1004 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1005 close $fh; 1161 aio_close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1163 }
1008 } else { 1164 } else {
1009 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1010 } 1166 }
1011 1167
1012 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1013 } else { 1172 } else {
1014 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1015 } 1174 }
1016 } else { 1175 } else {
1017 aio_unlink $filename; 1176 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1019 } 1178 }
1020 } 1179 };
1021} 1180}
1022 1181
1023sub object_freezer_as_string { 1182sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
1025 1184
1037 or return; 1196 or return;
1038 1197
1039 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1200 or return;
1201
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1043 } 1204 }
1044 1205
1206 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
1047 return ($data, $av); 1210 ($data, $av)
1048} 1211}
1049 1212
1050=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1051 1214
1052=over 4 1215=over 4
1106 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1107 1270
1108 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1109} 1272}
1110 1273
1274use File::Glob ();
1275
1111cf::player->attach ( 1276cf::player->attach (
1112 on_command => sub { 1277 on_command => sub {
1113 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1114 1279
1115 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1125 my ($pl, $buf) = @_; 1290 my ($pl, $buf) = @_;
1126 1291
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1293
1129 if (ref $msg) { 1294 if (ref $msg) {
1295 my ($type, $reply, @payload) =
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299
1300 my @reply;
1301
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1302 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1303 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1304 }
1305
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1135 } else { 1309 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1311 }
1138 1312
1139 cf::override; 1313 cf::override;
1140 }, 1314 },
1141); 1315);
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}
1142 1329
1143sub load_extensions { 1330sub load_extensions {
1144 cf::sync_job { 1331 cf::sync_job {
1145 my %todo; 1332 my %todo;
1146 1333
1166 1353
1167 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1168 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1169 1356
1170 $ext{source} = 1357 $ext{source} =
1171 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1172 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1173 . $source 1360 . $source
1174 . "\n};\n1"; 1361 . "\n};\n1";
1175 1362
1176 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1192 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1193 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1194 1381
1195 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1196 warn $msg; 1383 warn $msg;
1197 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1198 exit 1;
1199 } 1385 }
1200 1386
1201 warn $msg; 1387 warn $msg;
1202 } 1388 }
1203 1389
1217 1403
1218=back 1404=back
1219 1405
1220=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1221 1407
1222Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1223 1409
1224=cut 1410=cut
1225 1411
1226package cf::player; 1412package cf::player;
1227 1413
1228use Coro::AIO; 1414use Coro::AIO;
1229 1415
1230=head3 cf::player 1416=head3 cf::player
1231 1417
1232=over 4 1418=over 4
1419
1420=item cf::player::num_playing
1421
1422Returns the official number of playing players, as per the Crossfire metaserver rules.
1423
1424=cut
1425
1426sub num_playing {
1427 scalar grep
1428 $_->ob->map
1429 && !$_->hidden
1430 && !$_->ob->flag (cf::FLAG_WIZ),
1431 cf::player::list
1432}
1233 1433
1234=item cf::player::find $login 1434=item cf::player::find $login
1235 1435
1236Returns the given player object, loading it if necessary (might block). 1436Returns the given player object, loading it if necessary (might block).
1237 1437
1256 1456
1257sub exists($) { 1457sub exists($) {
1258 my ($login) = @_; 1458 my ($login) = @_;
1259 1459
1260 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1261 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1262} 1462}
1263 1463
1264sub find($) { 1464sub find($) {
1265 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1266 my $login = $_[0]; 1466 my $login = $_[0];
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1473 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1474 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1475 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1477
1278 my $pl = load_pl path $login 1478 my $f = new_from_file cf::object::thawer path $login
1279 or return; 1479 or return;
1480
1481 my $pl = cf::player::load_pl $f
1482 or return;
1483
1484 local $cf::PLAYER_LOADING{$login} = $pl;
1485 $f->resolve_delayed_derefs;
1280 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1281 } 1487 }
1282 } 1488 }
1283} 1489}
1284 1490
1293 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1294 1500
1295 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1297 1503
1504 cf::get_slot 0.01;
1505
1298 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1299 Coro::cede; 1507 cf::cede_to_tick;
1300} 1508}
1301 1509
1302sub new($) { 1510sub new($) {
1303 my ($login) = @_; 1511 my ($login) = @_;
1304 1512
1310 $cf::PLAYER{$login} = $self; 1518 $cf::PLAYER{$login} = $self;
1311 1519
1312 $self 1520 $self
1313} 1521}
1314 1522
1523=item $player->send_msg ($channel, $msg, $color, [extra...])
1524
1525=cut
1526
1527sub send_msg {
1528 my $ns = shift->ns
1529 or return;
1530 $ns->send_msg (@_);
1531}
1532
1315=item $pl->quit_character 1533=item $pl->quit_character
1316 1534
1317Nukes the player without looking back. If logged in, the connection will 1535Nukes the player without looking back. If logged in, the connection will
1318be destroyed. May block for a long time. 1536be destroyed. May block for a long time.
1319 1537
1323 my ($pl) = @_; 1541 my ($pl) = @_;
1324 1542
1325 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1326 1544
1327 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1328 $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
1329 1547
1330 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1331 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1332 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1333 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1334 1554
1335 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1336 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1372 or return []; 1592 or return [];
1373 1593
1374 my @logins; 1594 my @logins;
1375 1595
1376 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1597 my $path = path $login;
1598
1599 # a .pst is a dead give-away for a valid player
1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1605 }
1380 1606
1381 utf8::decode $login; 1607 utf8::decode $login;
1382 push @logins, $login; 1608 push @logins, $login;
1383 } 1609 }
1384 1610
1411 } 1637 }
1412 1638
1413 \@paths 1639 \@paths
1414} 1640}
1415 1641
1416=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1417 1643
1418Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1419 1645
1420=cut
1421
1422sub expand_cfpod {
1423 ((my $self), (local $_)) = @_;
1424
1425 # escape & and <
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428
1429 # this is buggy, it needs to properly take care of nested <'s
1430
1431 1 while
1432 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/
1436 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1
1439 }ge
1440 # replace H<hint text>
1441 || s{H<([^\>]*)>}
1442 {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "")
1446 [$self->{hintmode}]
1447 }ge;
1448
1449 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g;
1451
1452 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1457
1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1464}
1465
1466=item $player->ext_reply ($msgid, %msg) 1646=item $player->ext_reply ($msgid, @msg)
1467 1647
1468Sends an ext reply to the player. 1648Sends an ext reply to the player.
1469 1649
1470=cut 1650=cut
1471 1651
1472sub ext_reply($$%) { 1652sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1653 my ($self, $id, @msg) = @_;
1474 1654
1475 $msg{msgid} = $id; 1655 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1656}
1478 1657
1479=item $player->ext_event ($type, %msg) 1658=item $player->ext_msg ($type, @msg)
1480 1659
1481Sends an ext event to the client. 1660Sends an ext event to the client.
1482 1661
1483=cut 1662=cut
1484 1663
1485sub ext_event($$%) { 1664sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1665 my ($self, $type, @msg) = @_;
1487 1666
1488 $self->ns->ext_event ($type, %msg); 1667 $self->ns->ext_msg ($type, @msg);
1489} 1668}
1490 1669
1491=head3 cf::region 1670=head3 cf::region
1492 1671
1493=over 4 1672=over 4
1537our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1538our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1539 1718
1540sub generate_random_map { 1719sub generate_random_map {
1541 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
1542 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1543 $self->_create_random_map ( 1725 $self->_create_random_map (
1544 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1545 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1546 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1668 1850
1669# the temporary/swap location 1851# the temporary/swap location
1670sub save_path { 1852sub save_path {
1671 my ($self) = @_; 1853 my ($self) = @_;
1672 1854
1673 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1674 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1675} 1857}
1676 1858
1677# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1678sub uniq_path { 1860sub uniq_path {
1679 my ($self) = @_; 1861 my ($self) = @_;
1680 1862
1681 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1682 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1683}
1684
1685# and all this just because we cannot iterate over
1686# all maps in C++...
1687sub change_all_map_light {
1688 my ($change) = @_;
1689
1690 $_->change_map_light ($change)
1691 for grep $_->outdoor, values %cf::MAP;
1692} 1865}
1693 1866
1694sub decay_objects { 1867sub decay_objects {
1695 my ($self) = @_; 1868 my ($self) = @_;
1696 1869
1709 1882
1710sub load_header_from($) { 1883sub load_header_from($) {
1711 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1712 1885
1713 utf8::encode $path; 1886 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1719 1895
1720 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1721 1897
1722 1 1898 1
1723} 1899}
1777sub find { 1953sub find {
1778 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1779 1955
1780 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1781 1957
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1783 1960
1784 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1785 my $guard = cf::lock_acquire "map_find:$path";
1786 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1787 or return; 1963 or return;
1788 1964
1789 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1790 1966
1792 or return; 1968 or return;
1793 1969
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1797 $map->reset; 1975 $map->reset;
1798 undef $guard;
1799 return find $path; 1976 return find $path;
1800 } 1977 }
1801 1978
1802 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1803 } 1980 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1813 1990
1814 my $path = $self->{path}; 1991 my $path = $self->{path};
1815 1992
1816 { 1993 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1818 1995
1996 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 1998
1821 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1822 2000
1823 $self->alloc; 2001 $self->alloc;
1824 2002
1825 $self->pre_load; 2003 $self->pre_load;
1826 Coro::cede; 2004 cf::cede_to_tick;
1827 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1829 or return; 2009 or return;
1830 2010
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1832 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1833 2013
1834 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 2015 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 2018 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1839 } 2022 }
1840 } 2023 }
1841 2024
1842 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1843 # now do the right thing for maps 2028 # now do the right thing for maps
1844 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 2031 unless $self->difficulty;
1847 Coro::cede; 2032 cf::cede_to_tick;
1848 2033
1849 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 2035 $self->decay_objects;
1851 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1852 $self->update_buttons; 2037 $self->update_buttons;
1853 Coro::cede; 2038 cf::cede_to_tick;
1854 $self->set_darkness_map;
1855 Coro::cede;
1856 $self->activate; 2039 $self->activate;
1857 } 2040 }
1858 2041
2042 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME);
2044
1859 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
1860 } 2046 }
1861 2047
1862 $self->post_load; 2048 $self->post_load;
1863} 2049}
1864 2050
1873 2059
1874 $self 2060 $self
1875} 2061}
1876 2062
1877# find and load all maps in the 3x3 area around a map 2063# find and load all maps in the 3x3 area around a map
1878sub load_diag { 2064sub load_neighbours {
1879 my ($map) = @_; 2065 my ($map) = @_;
1880 2066
1881 my @diag; # diagonal neighbours 2067 my @neigh; # diagonal neighbours
1882 2068
1883 for (0 .. 3) { 2069 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 2070 my $neigh = $map->tile_path ($_)
1885 or next; 2071 or next;
1886 $neigh = find $neigh, $map 2072 $neigh = find $neigh, $map
1887 or next; 2073 or next;
1888 $neigh->load; 2074 $neigh->load;
1889 2075
2076 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2079 }
1893 2080
1894 for (@diag) { 2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2083 my $neigh = find $path, $origin
1896 or next; 2084 or next;
1897 $neigh->load; 2085 $neigh->load;
1898 } 2086 }
1899} 2087}
1900 2088
1905} 2093}
1906 2094
1907sub do_load_sync { 2095sub do_load_sync {
1908 my ($map) = @_; 2096 my ($map) = @_;
1909 2097
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main;
2100
1910 cf::sync_job { $map->load }; 2101 cf::sync_job { $map->load };
1911} 2102}
1912 2103
1913our %MAP_PREFETCH; 2104our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2105our $MAP_PREFETCHER = undef;
1915 2106
1916sub find_async { 2107sub find_async {
1917 my ($path, $origin) = @_; 2108 my ($path, $origin, $load) = @_;
1918 2109
1919 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
1920 2111
1921 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1923 } 2114 }
1924 2115
1925 undef $MAP_PREFETCH{$path}; 2116 $MAP_PREFETCH{$path} |= $load;
2117
1926 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2119 $Coro::current->{desc} = "map prefetcher";
2120
1927 while (%MAP_PREFETCH) { 2121 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2122 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2123 if (my $map = find $k) {
1930 $map->load; 2124 $map->load if $v;
1931 } 2125 }
1932 2126
1933 delete $MAP_PREFETCH{$path}; 2127 delete $MAP_PREFETCH{$k};
1934 } 2128 }
1935 } 2129 }
1936 undef $MAP_PREFETCHER; 2130 undef $MAP_PREFETCHER;
1937 }; 2131 };
1938 $MAP_PREFETCHER->prio (6); 2132 $MAP_PREFETCHER->prio (6);
1941} 2135}
1942 2136
1943sub save { 2137sub save {
1944 my ($self) = @_; 2138 my ($self) = @_;
1945 2139
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2141
1948 $self->{last_save} = $cf::RUNTIME; 2142 $self->{last_save} = $cf::RUNTIME;
1949 2143
1950 return unless $self->dirty; 2144 return unless $self->dirty;
1951 2145
1957 return if $self->{deny_save}; 2151 return if $self->{deny_save};
1958 2152
1959 local $self->{last_access} = $self->last_access;#d# 2153 local $self->{last_access} = $self->last_access;#d#
1960 2154
1961 cf::async { 2155 cf::async {
2156 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
1963 }; 2158 };
2159
2160 cf::get_slot 0.02;
1964 2161
1965 if ($uniq) { 2162 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1967 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1968 } else { 2165 } else {
1974 my ($self) = @_; 2171 my ($self) = @_;
1975 2172
1976 # save first because save cedes 2173 # save first because save cedes
1977 $self->save; 2174 $self->save;
1978 2175
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2177
1981 return if $self->players; 2178 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
1983 return if $self->{deny_save}; 2180 return if $self->{deny_save};
1984 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2186 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2187}
1988 2188
1989sub reset_at { 2189sub reset_at {
1990 my ($self) = @_; 2190 my ($self) = @_;
1991 2191
2023 if $uniq; 2223 if $uniq;
2024 } 2224 }
2025 2225
2026 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
2027 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2230 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2231
2032 $self->unlink_save; 2232 $self->unlink_save;
2033 $self->destroy; 2233 $self->destroy;
2034} 2234}
2035 2235
2036my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
2037 2237
2038sub nuke { 2238sub nuke {
2039 my ($self) = @_; 2239 my ($self) = @_;
2040 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2041 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2042 2245
2043 $self->unlink_save; 2246 $self->unlink_save;
2044 2247
2045 bless $self, "cf::map"; 2248 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2253
2051 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
2052 2256
2053 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2054} 2258}
2055 2259
2056=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
2098 2302
2099sub unique_maps() { 2303sub unique_maps() {
2100 [ 2304 [
2101 map { 2305 map {
2102 utf8::decode $_; 2306 utf8::decode $_;
2103 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
2104 ? normalise $_ 2310 : normalise $_
2105 : ()
2106 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
2107 ] 2312 ]
2108} 2313}
2109 2314
2110package cf;
2111
2112=back 2315=back
2113 2316
2114=head3 cf::object 2317=head3 cf::object
2115 2318
2116=cut 2319=cut
2119 2322
2120=over 4 2323=over 4
2121 2324
2122=item $ob->inv_recursive 2325=item $ob->inv_recursive
2123 2326
2124Returns 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.
2125 2329
2126=cut 2330=cut
2127 2331
2128sub inv_recursive_; 2332sub inv_recursive_;
2129sub inv_recursive_ { 2333sub inv_recursive_ {
2132 2336
2133sub inv_recursive { 2337sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2135} 2339}
2136 2340
2341=item $ref = $ob->ref
2342
2343Creates and returns a persistent reference to an object that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
2137package cf; 2369package cf;
2138 2370
2139=back 2371=back
2140 2372
2141=head3 cf::object::player 2373=head3 cf::object::player
2147Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2379Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2148can 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
2149dialogue with the given NPC character. 2381dialogue with the given NPC character.
2150 2382
2151=cut 2383=cut
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};
2152 2398
2153# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2154# with dialog boxes. 2400# with dialog boxes.
2155#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
2156sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2163 2409
2164 } else { 2410 } else {
2165 my $pl = $self->contr; 2411 my $pl = $self->contr;
2166 2412
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2413 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2416
2176 } else { 2417 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2179 } 2420 }
2180 } 2421 }
2422}
2423
2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2425
2426=cut
2427
2428sub cf::object::send_msg {
2429 my $pl = shift->contr
2430 or return;
2431 $pl->send_msg (@_);
2181} 2432}
2182 2433
2183=item $player_object->may ("access") 2434=item $player_object->may ("access")
2184 2435
2185Returns wether the given player is authorized to access resource "access" 2436Returns wether the given player is authorized to access resource "access"
2198 2449
2199=item $player_object->enter_link 2450=item $player_object->enter_link
2200 2451
2201Freezes 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}>).
2202 2453
2203The 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.
2204I<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.
2205 2458
2206Will never block. 2459Will never block.
2207 2460
2208=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2209 2462
2264 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2267 2520
2268 $map->load; 2521 $map->load;
2269 $map->load_diag; 2522 $map->load_neighbours;
2270 2523
2271 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2272 $self->activate_recursive; 2526 $self->activate_recursive;
2273 2527
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2275 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2276} 2530}
2281her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2282that 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
2283the 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
2284be called at the end of this process. 2538be called at the end of this process.
2285 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
2286=cut 2543=cut
2287 2544
2288our $GOTOGEN; 2545our $GOTOGEN;
2289 2546
2290sub cf::object::player::goto { 2547sub cf::object::player::goto {
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2552
2296 $self->enter_link; 2553 $self->enter_link;
2297 2554
2298 (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
2299 my $map = eval { 2577 my $map = eval {
2300 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2301 2579
2302 if ($map) { 2580 if ($map) {
2303 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2305 } else { 2583 } else {
2306 $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);
2307 } 2585 }
2308 2586
2309 $map 2587 $map
2310 }; 2588 };
2311 2589
2347} 2625}
2348 2626
2349sub prepare_random_map { 2627sub prepare_random_map {
2350 my ($exit) = @_; 2628 my ($exit) = @_;
2351 2629
2352 my $guard = cf::lock_acquire "exit_prepare:$exit";
2353
2354 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2355 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2356 # that depends on the exit object 2632 # that depends on the exit object
2357 2633
2358 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
2360 if ($exit->map) { 2636 if ($exit->map) {
2361 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2362 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2363 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2364 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2365 } 2643 }
2366 2644
2367 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2368 2646
2369 my $data = cf::to_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2370 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2371 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2372 2650
2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2374 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2375 undef $fh; 2653 undef $fh;
2376 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2377 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2378 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2379 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2380 } 2662 }
2381} 2663}
2382 2664
2383sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2384 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2385 2667
2386 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2387 2669
2388 if ($exit->slaying eq "/!") {
2389 #TODO: this should de-fi-ni-te-ly not be a sync-job
2390 # the problem is that $exit might not survive long enough
2391 # so it needs to be done right now, right here
2392 cf::sync_job { prepare_random_map $exit };
2393 }
2394
2395 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2396 my $hp = $exit->stats->hp;
2397 my $sp = $exit->stats->sp;
2398
2399 $self->enter_link; 2670 $self->enter_link;
2400 2671
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
2404
2405 (async { 2672 (async {
2406 $self->deactivate_recursive; # just to be sure 2673 $Coro::current->{desc} = "enter_exit";
2674
2407 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
2408 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2409 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
2410 1; 2696 1
2411 }) { 2697 }) {
2412 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2413 . "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. "
2414 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2415 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2416 2702
2417 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
2445the 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
2446the message unless the client supports the msg packet. 2732the message unless the client supports the msg packet.
2447 2733
2448=cut 2734=cut
2449 2735
2736# non-persistent channels (usually the info channel)
2737our %CHANNEL = (
2738 "c/identify" => {
2739 id => "infobox",
2740 title => "Identify",
2741 reply => undef,
2742 tooltip => "Items recently identified",
2743 },
2744 "c/examine" => {
2745 id => "infobox",
2746 title => "Examine",
2747 reply => undef,
2748 tooltip => "Signs and other items you examined",
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/death" => {
2799 id => "death",
2800 title => "Death",
2801 reply => undef,
2802 tooltip => "Reason for and more info about your most recent death",
2803 },
2804 "c/say" => $SAY_CHANNEL,
2805 "c/chat" => $CHAT_CHANNEL,
2806);
2807
2450sub cf::client::send_msg { 2808sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2809 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2810
2453 $msg = $self->pl->expand_cfpod ($msg); 2811 $msg = $self->pl->expand_cfpod ($msg)
2812 unless $color & cf::NDI_VERBATIM;
2454 2813
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2814 $color &= cf::NDI_CLIENT_MASK; # just in case...
2456 2815
2816 # check predefined channels, for the benefit of C
2817 if ($CHANNEL{$channel}) {
2818 $channel = $CHANNEL{$channel};
2819
2820 $self->ext_msg (channel_info => $channel);
2821 $channel = $channel->{id};
2822
2457 if (ref $channel) { 2823 } elsif (ref $channel) {
2458 # send meta info to client, if not yet sent 2824 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2825 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2826 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2827 $self->ext_msg (channel_info => $channel);
2462 } 2828 }
2463 2829
2464 $channel = $channel->{id}; 2830 $channel = $channel->{id};
2465 } 2831 }
2466 2832
2467 return unless @extra || length $msg; 2833 return unless @extra || length $msg;
2468 2834
2469 if ($self->can_msg) { 2835 # default colour, mask it out
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2836 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2471 } else { 2837 if $color & cf::NDI_DEF;
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481 2838
2482 if ($color >= 0) { 2839 my $pkt = "msg "
2483 if (0 && $msg =~ /\[/) { 2840 . $self->{json_coder}->encode (
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2485 } else { 2842 );
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg")
2488 }
2489 }
2490 }
2491}
2492 2843
2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2847
2848 # split very large packets
2849 if (8192 < length $pkt and $self->{can_lzf}) {
2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2851 $pkt = "frag";
2852 }
2853
2854 $self->send_packet ($pkt);
2855}
2856
2493=item $client->ext_event ($type, %msg) 2857=item $client->ext_msg ($type, @msg)
2494 2858
2495Sends an ext event to the client. 2859Sends an ext event to the client.
2496 2860
2497=cut 2861=cut
2498 2862
2499sub cf::client::ext_event($$%) { 2863sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2864 my ($self, $type, @msg) = @_;
2501 2865
2502 return unless $self->extcmd; 2866 if ($self->extcmd == 2) {
2503 2867 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2868 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2869 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2870 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2871 }
2872}
2873
2874=item $client->ext_reply ($msgid, @msg)
2875
2876Sends an ext reply to the client.
2877
2878=cut
2879
2880sub cf::client::ext_reply($$@) {
2881 my ($self, $id, @msg) = @_;
2882
2883 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2885 } elsif ($self->extcmd == 1) {
2886 #TODO: version 1, remove
2887 unshift @msg, msgtype => "reply", msgid => $id;
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 }
2506} 2890}
2507 2891
2508=item $success = $client->query ($flags, "text", \&cb) 2892=item $success = $client->query ($flags, "text", \&cb)
2509 2893
2510Queues a query to the client, calling the given callback with 2894Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2949 my ($ns, $buf) = @_;
2566 2950
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2951 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2952
2569 if (ref $msg) { 2953 if (ref $msg) {
2954 my ($type, $reply, @payload) =
2955 "ARRAY" eq ref $msg
2956 ? @$msg
2957 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2958
2959 my @reply;
2960
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2961 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2962 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2963 }
2964
2965 $ns->ext_reply ($reply, @reply)
2966 if $reply;
2967
2576 } else { 2968 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2969 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2970 }
2579 2971
2580 cf::override; 2972 cf::override;
2627our $safe = new Safe "safe"; 3019our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 3020our $safe_hole = new Safe::Hole;
2629 3021
2630$SIG{FPE} = 'IGNORE'; 3022$SIG{FPE} = 'IGNORE';
2631 3023
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3024$safe->permit_only (Opcode::opset qw(
3025 :base_core :base_mem :base_orig :base_math
3026 grepstart grepwhile mapstart mapwhile
3027 sort time
3028));
2633 3029
2634# here we export the classes and methods available to script code 3030# here we export the classes and methods available to script code
2635 3031
2636=pod 3032=pod
2637 3033
2638The following functions and methods are available within a safe environment: 3034The following functions and methods are available within a safe environment:
2639 3035
2640 cf::object 3036 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 3037 contr pay_amount pay_player map x y force_find force_add destroy
2642 insert remove 3038 insert remove name archname title slaying race decrease split
2643 3039
2644 cf::object::player 3040 cf::object::player
2645 player 3041 player
2646 3042
2647 cf::player 3043 cf::player
2652 3048
2653=cut 3049=cut
2654 3050
2655for ( 3051for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)], 3053 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)],
2658 ["cf::object::player" => qw(player)], 3055 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 3056 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 3057 ["cf::map" => qw(trigger)],
2661) { 3058) {
2662 no strict 'refs'; 3059 no strict 'refs';
2738# the server's init and main functions 3135# the server's init and main functions
2739 3136
2740sub load_facedata($) { 3137sub load_facedata($) {
2741 my ($path) = @_; 3138 my ($path) = @_;
2742 3139
3140 # HACK to clear player env face cache, we need some signal framework
3141 # for this (global event?)
3142 %ext::player_env::MUSIC_FACE_CACHE = ();
3143
3144 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3145
2743 warn "loading facedata from $path\n"; 3146 warn "loading facedata from $path\n";
2744 3147
2745 my $facedata; 3148 my $facedata;
2746 0 < aio_load $path, $facedata 3149 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3150 or die "$path: $!";
2749 $facedata = Coro::Storable::thaw $facedata; 3152 $facedata = Coro::Storable::thaw $facedata;
2750 3153
2751 $facedata->{version} == 2 3154 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3155 or cf::cleanup "$path: version mismatch, cannot proceed.";
2753 3156
3157 # patch in the exptable
3158 $facedata->{resource}{"res/exp_table"} = {
3159 type => FT_RSRC,
3160 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3161 };
3162 cf::cede_to_tick;
3163
2754 { 3164 {
2755 my $faces = $facedata->{faceinfo}; 3165 my $faces = $facedata->{faceinfo};
2756 3166
2757 while (my ($face, $info) = each %$faces) { 3167 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3168 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3169
2759 cf::face::set_visibility $idx, $info->{visibility}; 3170 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3171 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3172 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3173 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3174
2764 cf::cede_to_tick; 3175 cf::cede_to_tick;
2765 } 3176 }
2766 3177
2767 while (my ($face, $info) = each %$faces) { 3178 while (my ($face, $info) = each %$faces) {
2768 next unless $info->{smooth}; 3179 next unless $info->{smooth};
3180
2769 my $idx = cf::face::find $face 3181 my $idx = cf::face::find $face
2770 or next; 3182 or next;
3183
2771 if (my $smooth = cf::face::find $info->{smooth}) { 3184 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth; 3185 cf::face::set_smooth $idx, $smooth;
2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3186 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2774 } else { 3187 } else {
2775 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3188 warn "smooth face '$info->{smooth}' not found for face '$face'";
2792 3205
2793 { 3206 {
2794 # TODO: for gcfclient pleasure, we should give resources 3207 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3208 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3209 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798 3210
2799 while (my ($name, $info) = each %$res) { 3211 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({ 3212 if (defined $info->{type}) {
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3213 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3214 my $data;
2807 3215
2808 if ($name =~ /\.jpg$/) { 3216 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3217 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3218
3219 my $meta = $enc->encode ({
3220 name => $name,
3221 %{ $info->{meta} || {} },
3222 });
3223
3224 $data = pack "(w/a*)*", $meta, $info->{data};
3225 } else {
3226 $data = $info->{data};
3227 }
3228
3229 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3230 cf::face::set_type $idx, $info->{type};
2811 } else { 3231 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3232 $RESOURCE{$name} = $info;
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3233 }
2818 3234
2819 cf::cede_to_tick; 3235 cf::cede_to_tick;
2820 } 3236 }
2821 } 3237 }
2822 3238
3239 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3240
2823 1 3241 1
2824} 3242}
2825 3243
3244cf::global->attach (on_resource_update => sub {
3245 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3246 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3247
3248 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3249 my $sound = $soundconf->{compat}[$_]
3250 or next;
3251
3252 my $face = cf::face::find "sound/$sound->[1]";
3253 cf::sound::set $sound->[0] => $face;
3254 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3255 }
3256
3257 while (my ($k, $v) = each %{$soundconf->{event}}) {
3258 my $face = cf::face::find "sound/$v";
3259 cf::sound::set $k => $face;
3260 }
3261 }
3262});
3263
3264register_exticmd fx_want => sub {
3265 my ($ns, $want) = @_;
3266
3267 while (my ($k, $v) = each %$want) {
3268 $ns->fx_want ($k, $v);
3269 }
3270};
3271
3272sub load_resource_file($) {
3273 my $guard = lock_acquire "load_resource_file";
3274
3275 my $status = load_resource_file_ $_[0];
3276 get_slot 0.1, 100;
3277 cf::arch::commit_load;
3278
3279 $status
3280}
3281
2826sub reload_regions { 3282sub reload_regions {
3283 # HACK to clear player env face cache, we need some signal framework
3284 # for this (global event?)
3285 %ext::player_env::MUSIC_FACE_CACHE = ();
3286
2827 load_resource_file "$MAPDIR/regions" 3287 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3288 or die "unable to load regions file\n";
2829 3289
2830 for (cf::region::list) { 3290 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3291 $_->{match} = qr/$_->{match}/
2839} 3299}
2840 3300
2841sub reload_archetypes { 3301sub reload_archetypes {
2842 load_resource_file "$DATADIR/archetypes" 3302 load_resource_file "$DATADIR/archetypes"
2843 or die "unable to load archetypes\n"; 3303 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2847 load_resource_file "$DATADIR/archetypes"
2848 or die "unable to load archetypes\n";
2849} 3304}
2850 3305
2851sub reload_treasures { 3306sub reload_treasures {
2852 load_resource_file "$DATADIR/treasures" 3307 load_resource_file "$DATADIR/treasures"
2853 or die "unable to load treasurelists\n"; 3308 or die "unable to load treasurelists\n";
2854} 3309}
2855 3310
2856sub reload_resources { 3311sub reload_resources {
2857 warn "reloading resource files...\n"; 3312 warn "reloading resource files...\n";
2858 3313
3314 reload_facedata;
3315 reload_archetypes;
2859 reload_regions; 3316 reload_regions;
2860 reload_facedata;
2861 #reload_archetypes;#d#
2862 reload_archetypes;
2863 reload_treasures; 3317 reload_treasures;
2864 3318
2865 warn "finished reloading resource files\n"; 3319 warn "finished reloading resource files\n";
2866} 3320}
2867 3321
2868sub init { 3322sub reload_config {
2869 reload_resources;
2870}
2871
2872sub cfg_load {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3323 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3324 or return;
2875 3325
2876 local $/; 3326 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3327 *CFG = YAML::Load <$fh>;
2878 3328
2879 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2880 3330
2881 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3331 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2882 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3332 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2888 }; 3338 };
2889 warn $@ if $@; 3339 warn $@ if $@;
2890 } 3340 }
2891} 3341}
2892 3342
3343sub pidfile() {
3344 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3345 or die "$PIDFILE: $!";
3346 flock $fh, &Fcntl::LOCK_EX
3347 or die "$PIDFILE: flock: $!";
3348 $fh
3349}
3350
3351# make sure only one server instance is running at any one time
3352sub atomic {
3353 my $fh = pidfile;
3354
3355 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0;
3357
3358 seek $fh, 0, 0;
3359 print $fh $$;
3360}
3361
2893sub main { 3362sub main {
3363 cf::init_globals; # initialise logging
3364
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374
3375 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3376
2894 # we must not ever block the main coroutine 3377 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3378 local $Coro::idle = sub {
2896 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3379 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897 (async { 3380 (async {
2898 Event::one_event; 3381 $Coro::current->{desc} = "IDLE BUG HANDLER";
3382 EV::loop EV::LOOP_ONESHOT;
2899 })->prio (Coro::PRIO_MAX); 3383 })->prio (Coro::PRIO_MAX);
2900 }; 3384 };
2901 3385
2902 cfg_load; 3386 evthread_start IO::AIO::poll_fileno;
3387
3388 cf::sync_job {
3389 reload_resources;
3390 reload_config;
2903 db_init; 3391 db_init;
3392
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid;
3396 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills;
3399
3400 cf::init_beforeplay;
3401
3402 atomic;
3403
2904 load_extensions; 3404 load_extensions;
2905 3405
2906 $TICK_WATCHER->start; 3406 utime time, time, $RUNTIMEFILE;
3407
3408 # no (long-running) fork's whatsoever before this point(!)
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410
3411 (pop @POST_INIT)->(0) while @POST_INIT;
3412 };
3413
2907 Event::loop; 3414 EV::loop;
2908} 3415}
2909 3416
2910############################################################################# 3417#############################################################################
2911# initialisation and cleanup 3418# initialisation and cleanup
2912 3419
2913# install some emergency cleanup handlers 3420# install some emergency cleanup handlers
2914BEGIN { 3421BEGIN {
3422 our %SIGWATCHER = ();
2915 for my $signal (qw(INT HUP TERM)) { 3423 for my $signal (qw(INT HUP TERM)) {
2916 Event->signal ( 3424 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2917 reentrant => 0,
2918 data => WF_AUTOCANCEL,
2919 signal => $signal,
2920 prio => 0,
2921 cb => sub {
2922 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
2923 },
2924 ); 3426 };
2925 } 3427 }
2926} 3428}
2927 3429
2928sub write_runtime { 3430sub write_runtime_sync {
2929 my $runtime = "$LOCALDIR/runtime";
2930
2931 # first touch the runtime file to show we are still running: 3431 # first touch the runtime file to show we are still running:
2932 # the fsync below can take a very very long time. 3432 # the fsync below can take a very very long time.
2933 3433
2934 IO::AIO::aio_utime $runtime, undef, undef; 3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2935 3435
2936 my $guard = cf::lock_acquire "write_runtime"; 3436 my $guard = cf::lock_acquire "write_runtime";
2937 3437
2938 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2939 or return; 3439 or return;
2940 3440
2941 my $value = $cf::RUNTIME + 90 + 10; 3441 my $value = $cf::RUNTIME + 90 + 10;
2942 # 10 is the runtime save interval, for a monotonic clock 3442 # 10 is the runtime save interval, for a monotonic clock
2943 # 60 allows for the watchdog to kill the server. 3443 # 60 allows for the watchdog to kill the server.
2953 aio_utime $fh, undef, undef; 3453 aio_utime $fh, undef, undef;
2954 3454
2955 close $fh 3455 close $fh
2956 or return; 3456 or return;
2957 3457
2958 aio_rename "$runtime~", $runtime 3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2959 and return; 3459 and return;
2960 3460
2961 warn "runtime file written.\n"; 3461 warn "runtime file written.\n";
2962 3462
2963 1 3463 1
3464}
3465
3466our $uuid_lock;
3467our $uuid_skip;
3468
3469sub write_uuid_sync($) {
3470 $uuid_skip ||= $_[0];
3471
3472 return if $uuid_lock;
3473 local $uuid_lock = 1;
3474
3475 my $uuid = "$LOCALDIR/uuid";
3476
3477 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3478 or return;
3479
3480 my $value = uuid_seq uuid_cur;
3481
3482 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n";
3484 return;
3485 }
3486
3487 my $value = uuid_str $value + $uuid_skip;
3488 $uuid_skip = 0;
3489
3490 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3491 and return;
3492
3493 # always fsync - this file is important
3494 aio_fsync $fh
3495 and return;
3496
3497 close $fh
3498 or return;
3499
3500 aio_rename "$uuid~", $uuid
3501 and return;
3502
3503 warn "uuid file written ($value).\n";
3504
3505 1
3506
3507}
3508
3509sub write_uuid($$) {
3510 my ($skip, $sync) = @_;
3511
3512 $sync ? write_uuid_sync $skip
3513 : async { write_uuid_sync $skip };
2964} 3514}
2965 3515
2966sub emergency_save() { 3516sub emergency_save() {
2967 my $freeze_guard = cf::freeze_mainloop; 3517 my $freeze_guard = cf::freeze_mainloop;
2968 3518
2969 warn "enter emergency perl save\n"; 3519 warn "emergency_perl_save: enter\n";
2970 3520
2971 cf::sync_job { 3521 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526
2972 # use a peculiar iteration method to avoid tripping on perl 3527 # use a peculiar iteration method to avoid tripping on perl
2973 # refcount bugs in for. also avoids problems with players 3528 # refcount bugs in for. also avoids problems with players
2974 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3530 warn "emergency_perl_save: begin player save\n";
2976 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3535 $pl->save;
2980 } 3536 }
2981 warn "end emergency player save\n"; 3537 warn "emergency_perl_save: end player save\n";
2982 3538
2983 warn "begin emergency map save\n"; 3539 warn "emergency_perl_save: begin map save\n";
2984 for my $path (keys %cf::MAP) { 3540 for my $path (keys %cf::MAP) {
2985 my $map = $cf::MAP{$path} or next; 3541 my $map = $cf::MAP{$path} or next;
2986 $map->valid or next; 3542 $map->valid or next;
2987 $map->save; 3543 $map->save;
2988 } 3544 }
2989 warn "end emergency map save\n"; 3545 warn "emergency_perl_save: end map save\n";
2990 3546
2991 warn "begin emergency database checkpoint\n"; 3547 warn "emergency_perl_save: begin database checkpoint\n";
2992 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
2993 warn "end emergency database checkpoint\n"; 3549 warn "emergency_perl_save: end database checkpoint\n";
3550
3551 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "emergency_perl_save: end write uuid\n";
2994 }; 3554 };
2995 3555
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
2996 warn "leave emergency perl save\n"; 3561 warn "emergency_perl_save: leave\n";
2997} 3562}
2998 3563
2999sub post_cleanup { 3564sub post_cleanup {
3000 my ($make_core) = @_; 3565 my ($make_core) = @_;
3001 3566
3002 warn Carp::longmess "post_cleanup backtrace" 3567 warn Carp::longmess "post_cleanup backtrace"
3003 if $make_core; 3568 if $make_core;
3569
3570 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$;
3572}
3573
3574# a safer delete_package, copied from Symbol
3575sub clear_package($) {
3576 my $pkg = shift;
3577
3578 # expand to full symbol table name if needed
3579 unless ($pkg =~ /^main::.*::$/) {
3580 $pkg = "main$pkg" if $pkg =~ /^::/;
3581 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3582 $pkg .= '::' unless $pkg =~ /::$/;
3583 }
3584
3585 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3586 my $stem_symtab = *{$stem}{HASH};
3587
3588 defined $stem_symtab and exists $stem_symtab->{$leaf}
3589 or return;
3590
3591 # clear all symbols
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 }
3597 warn "cleared package $pkg\n";#d#
3004} 3598}
3005 3599
3006sub do_reload_perl() { 3600sub do_reload_perl() {
3007 # can/must only be called in main 3601 # can/must only be called in main
3008 if ($Coro::current != $Coro::main) { 3602 if ($Coro::current != $Coro::main) {
3009 warn "can only reload from main coroutine"; 3603 warn "can only reload from main coroutine";
3010 return; 3604 return;
3011 } 3605 }
3012 3606
3607 return if $RELOAD++;
3608
3609 my $t1 = EV::time;
3610
3611 while ($RELOAD) {
3013 warn "reloading..."; 3612 warn "reloading...";
3014 3613
3015 warn "entering sync_job"; 3614 warn "entering sync_job";
3016 3615
3017 cf::sync_job { 3616 cf::sync_job {
3018 cf::write_runtime; # external watchdog should not bark 3617 cf::write_runtime_sync; # external watchdog should not bark
3019 cf::emergency_save; 3618 cf::emergency_save;
3020 cf::write_runtime; # external watchdog should not bark 3619 cf::write_runtime_sync; # external watchdog should not bark
3021 3620
3022 warn "syncing database to disk"; 3621 warn "syncing database to disk";
3023 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3024 3623
3025 # if anything goes wrong in here, we should simply crash as we already saved 3624 # if anything goes wrong in here, we should simply crash as we already saved
3026 3625
3027 warn "cancelling all WF_AUTOCANCEL watchers";
3028 for (Event::all_watchers) {
3029 $_->cancel if $_->data & WF_AUTOCANCEL;
3030 }
3031
3032 warn "flushing outstanding aio requests"; 3626 warn "flushing outstanding aio requests";
3033 for (;;) {
3034 BDB::flush;
3035 IO::AIO::flush;
3036 Coro::cede;
3037 last unless IO::AIO::nreqs || BDB::nreqs; 3627 while (IO::AIO::nreqs || BDB::nreqs) {
3038 warn "iterate..."; 3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3039 }
3040
3041 ++$RELOAD;
3042
3043 warn "cancelling all extension coros";
3044 $_->cancel for values %EXT_CORO;
3045 %EXT_CORO = ();
3046
3047 warn "removing commands";
3048 %COMMAND = ();
3049
3050 warn "removing ext/exti commands";
3051 %EXTCMD = ();
3052 %EXTICMD = ();
3053
3054 warn "unloading/nuking all extensions";
3055 for my $pkg (@EXTS) {
3056 warn "... unloading $pkg";
3057
3058 if (my $cb = $pkg->can ("unload")) {
3059 eval {
3060 $cb->($pkg);
3061 1
3062 } or warn "$pkg unloaded, but with errors: $@";
3063 } 3629 }
3064 3630
3065 warn "... nuking $pkg"; 3631 warn "cancelling all extension coros";
3066 Symbol::delete_package $pkg; 3632 $_->cancel for values %EXT_CORO;
3067 } 3633 %EXT_CORO = ();
3068 3634
3069 warn "unloading all perl modules loaded from $LIBDIR"; 3635 warn "removing commands";
3070 while (my ($k, $v) = each %INC) { 3636 %COMMAND = ();
3071 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3072 3637
3638 warn "removing ext/exti commands";
3639 %EXTCMD = ();
3640 %EXTICMD = ();
3641
3642 warn "unloading/nuking all extensions";
3643 for my $pkg (@EXTS) {
3073 warn "... unloading $k"; 3644 warn "... unloading $pkg";
3074 delete $INC{$k};
3075 3645
3076 $k =~ s/\.pm$//;
3077 $k =~ s/\//::/g;
3078
3079 if (my $cb = $k->can ("unload_module")) { 3646 if (my $cb = $pkg->can ("unload")) {
3647 eval {
3080 $cb->(); 3648 $cb->($pkg);
3649 1
3650 } or warn "$pkg unloaded, but with errors: $@";
3651 }
3652
3653 warn "... clearing $pkg";
3654 clear_package $pkg;
3081 } 3655 }
3082 3656
3083 Symbol::delete_package $k; 3657 warn "unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660
3661 warn "... unloading $k";
3662 delete $INC{$k};
3663
3664 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g;
3666
3667 if (my $cb = $k->can ("unload_module")) {
3668 $cb->();
3669 }
3670
3671 clear_package $k;
3084 } 3672 }
3085 3673
3086 warn "getting rid of safe::, as good as possible"; 3674 warn "getting rid of safe::, as good as possible";
3087 Symbol::delete_package "safe::$_" 3675 clear_package "safe::$_"
3088 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3089 3677
3090 warn "unloading cf.pm \"a bit\""; 3678 warn "unloading cf.pm \"a bit\"";
3091 delete $INC{"cf.pm"}; 3679 delete $INC{"cf.pm"};
3092 delete $INC{"cf/pod.pm"}; 3680 delete $INC{"cf/pod.pm"};
3093 3681
3094 # don't, removes xs symbols, too, 3682 # don't, removes xs symbols, too,
3095 # and global variables created in xs 3683 # and global variables created in xs
3096 #Symbol::delete_package __PACKAGE__; 3684 #clear_package __PACKAGE__;
3097 3685
3098 warn "unload completed, starting to reload now"; 3686 warn "unload completed, starting to reload now";
3099 3687
3100 warn "reloading cf.pm"; 3688 warn "reloading cf.pm";
3101 require cf; 3689 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3691
3104 warn "loading config and database again"; 3692 warn "loading config and database again";
3105 cf::cfg_load; 3693 cf::reload_config;
3106 3694
3107 warn "loading extensions"; 3695 warn "loading extensions";
3108 cf::load_extensions; 3696 cf::load_extensions;
3109 3697
3698 if ($REATTACH_ON_RELOAD) {
3110 warn "reattaching attachments to objects/players"; 3699 warn "reattaching attachments to objects/players";
3111 _global_reattach; # objects, sockets 3700 _global_reattach; # objects, sockets
3112 warn "reattaching attachments to maps"; 3701 warn "reattaching attachments to maps";
3113 reattach $_ for values %MAP; 3702 reattach $_ for values %MAP;
3114 warn "reattaching attachments to players"; 3703 warn "reattaching attachments to players";
3115 reattach $_ for values %PLAYER; 3704 reattach $_ for values %PLAYER;
3705 }
3116 3706
3707 warn "running post_init jobs";
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709
3117 warn "leaving sync_job"; 3710 warn "leaving sync_job";
3118 3711
3119 1 3712 1
3120 } or do { 3713 } or do {
3121 warn $@; 3714 warn $@;
3122 warn "error while reloading, exiting."; 3715 cf::cleanup "error while reloading, exiting.";
3123 exit 1;
3124 }; 3716 };
3125 3717
3126 warn "reloaded"; 3718 warn "reloaded";
3719 --$RELOAD;
3720 }
3721
3722 $t1 = EV::time - $t1;
3723 warn "reload completed in ${t1}s\n";
3127}; 3724};
3128 3725
3129our $RELOAD_WATCHER; # used only during reload 3726our $RELOAD_WATCHER; # used only during reload
3130 3727
3131sub reload_perl() { 3728sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back, 3729 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here. 3730 # coro crashes during coro_state_free->destroy here.
3134 3731
3135 $RELOAD_WATCHER ||= Event->timer ( 3732 $RELOAD_WATCHER ||= cf::async {
3136 reentrant => 0, 3733 Coro::AIO::aio_wait cache_extensions;
3137 after => 0, 3734
3138 data => WF_AUTOCANCEL, 3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3139 cb => sub {
3140 do_reload_perl; 3736 do_reload_perl;
3141 undef $RELOAD_WATCHER; 3737 undef $RELOAD_WATCHER;
3142 }, 3738 };
3143 ); 3739 };
3144} 3740}
3145 3741
3146register_command "reload" => sub { 3742register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3743 my ($who, $arg) = @_;
3148 3744
3149 if ($who->flag (FLAG_WIZ)) { 3745 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3746 $who->message ("reloading server.");
3747 async {
3748 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3749 reload_perl;
3750 };
3152 } 3751 }
3153}; 3752};
3154 3753
3155unshift @INC, $LIBDIR; 3754unshift @INC, $LIBDIR;
3156 3755
3158 3757
3159our @WAIT_FOR_TICK; 3758our @WAIT_FOR_TICK;
3160our @WAIT_FOR_TICK_BEGIN; 3759our @WAIT_FOR_TICK_BEGIN;
3161 3760
3162sub wait_for_tick { 3761sub wait_for_tick {
3163 return unless $TICK_WATCHER->is_active;
3164 return if $Coro::current == $Coro::main; 3762 return if tick_inhibit || $Coro::current == $Coro::main;
3165 3763
3166 my $signal = new Coro::Signal; 3764 my $signal = new Coro::Signal;
3167 push @WAIT_FOR_TICK, $signal; 3765 push @WAIT_FOR_TICK, $signal;
3168 $signal->wait; 3766 $signal->wait;
3169} 3767}
3170 3768
3171sub wait_for_tick_begin { 3769sub wait_for_tick_begin {
3172 return unless $TICK_WATCHER->is_active;
3173 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3174 3771
3175 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3773 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3774 $signal->wait;
3178} 3775}
3179 3776
3180 my $min = 1e6;#d# 3777sub tick {
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer (
3183 reentrant => 0,
3184 parked => 1,
3185 prio => 0,
3186 at => $NEXT_TICK || $TICK,
3187 data => WF_AUTOCANCEL,
3188 cb => sub {
3189 if ($Coro::current != $Coro::main) { 3778 if ($Coro::current != $Coro::main) {
3190 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3779 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3191 unless ++$bug_warning > 10; 3780 unless ++$bug_warning > 10;
3192 return; 3781 return;
3193 } 3782 }
3194 3783
3195 $NOW = $tick_start = Event::time;
3196
3197 cf::server_tick; # one server iteration 3784 cf::server_tick; # one server iteration
3198 3785
3199 0 && sync_job {#d# 3786 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3200 for(1..10) { 3787 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3201 my $t = Event::time; 3788 Coro::async_pool {
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3789 $Coro::current->{desc} = "runtime saver";
3203 or die; 3790 write_runtime_sync
3204 3791 or warn "ERROR: unable to write runtime file: $!";
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 }; 3792 };
3793 }
3221 3794
3222 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK;
3224
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool {
3228 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!";
3230 };
3231 }
3232
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3795 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3796 $sig->send;
3238 } 3797 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3798 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3799 $sig->send;
3241 } 3800 }
3242 3801
3243 $NOW = Event::time; 3802 $LOAD = ($NOW - $TICK_START) / $TICK;
3244
3245 # if we are delayed by four ticks or more, skip them all
3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3247
3248 $TICK_WATCHER->at ($NEXT_TICK);
3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3803 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3804
3254 _post_tick; 3805 if (0) {
3255 3806 if ($NEXT_TICK) {
3256 3807 my $jitter = $TICK_START - $NEXT_TICK;
3808 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3809 warn "jitter $JITTER\n";#d#
3810 }
3257 }, 3811 }
3258); 3812}
3259 3813
3260{ 3814{
3261 BDB::max_poll_time $TICK * 0.1; 3815 # configure BDB
3262 $BDB_POLL_WATCHER = Event->io ( 3816
3263 reentrant => 0,
3264 fd => BDB::poll_fileno,
3265 poll => 'r',
3266 prio => 0,
3267 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb,
3269 );
3270 BDB::min_parallel 8; 3817 BDB::min_parallel 8;
3271 3818 BDB::max_poll_reqs $TICK * 0.1;
3272 BDB::set_sync_prepare { 3819 $AnyEvent::BDB::WATCHER->priority (1);
3273 my $status;
3274 my $current = $Coro::current;
3275 (
3276 sub {
3277 $status = $!;
3278 $current->ready; undef $current;
3279 },
3280 sub {
3281 Coro::schedule while defined $current;
3282 $! = $status;
3283 },
3284 )
3285 };
3286 3820
3287 unless ($DB_ENV) { 3821 unless ($DB_ENV) {
3288 $DB_ENV = BDB::db_env_create; 3822 $DB_ENV = BDB::db_env_create;
3823 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3824 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3825 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3826 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3827 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289 3828
3290 cf::sync_job { 3829 cf::sync_job {
3291 eval { 3830 eval {
3292 BDB::db_env_open 3831 BDB::db_env_open
3293 $DB_ENV, 3832 $DB_ENV,
3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3834 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3835 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3836 0666;
3298 3837
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3838 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3839 };
3304 3840
3305 cf::cleanup "db_env_open(db): $@" if $@; 3841 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3842 };
3307 } 3843 }
3844
3845 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3846 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3847 };
3848 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3849 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3850 };
3851 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3852 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3853 };
3308} 3854}
3309 3855
3310{ 3856{
3857 # configure IO::AIO
3858
3311 IO::AIO::min_parallel 8; 3859 IO::AIO::min_parallel 8;
3312
3313 undef $Coro::AIO::WATCHER;
3314 IO::AIO::max_poll_time $TICK * 0.1; 3860 IO::AIO::max_poll_time $TICK * 0.1;
3315 $AIO_POLL_WATCHER = Event->io ( 3861 undef $AnyEvent::AIO::WATCHER;
3316 reentrant => 0,
3317 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno,
3319 poll => 'r',
3320 prio => 6,
3321 cb => \&IO::AIO::poll_cb,
3322 );
3323} 3862}
3324 3863
3325my $_log_backtrace; 3864my $_log_backtrace;
3326 3865
3327sub _log_backtrace { 3866sub _log_backtrace {
3330 $msg =~ s/\n//; 3869 $msg =~ s/\n//;
3331 3870
3332 # limit the # of concurrent backtraces 3871 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3872 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3873 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg;
3335 async { 3875 async {
3876 $Coro::current->{desc} = "abt $msg";
3877
3336 my @bt = fork_call { 3878 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3879 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3880 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3881 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!"; 3882 or die "addr2line: $!";
3348 } 3890 }
3349 3891
3350 @funcs 3892 @funcs
3351 }; 3893 };
3352 3894
3353 LOG llevInfo, "[ABT] $msg\n"; 3895 LOG llevInfo, "[ABT] $perl_bt\n";
3896 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3354 LOG llevInfo, "[ABT] $_\n" for @bt; 3897 LOG llevInfo, "[ABT] $_\n" for @bt;
3355 --$_log_backtrace; 3898 --$_log_backtrace;
3356 }; 3899 };
3357 } else { 3900 } else {
3358 LOG llevInfo, "[ABT] $msg\n"; 3901 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines