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.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.459 by root, Sat Dec 13 21:46:12 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.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
919=cut 1042=cut
920 1043
921############################################################################# 1044#############################################################################
922# object support 1045# object support
923 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#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
1088
924sub reattach { 1089sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1091 my ($obj) = @_;
927 1092
1093 # no longer needed after getting rid of delete_package?
928 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
929 1095
930 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
931 1097
932 @$registry = (); 1098 @$registry = ();
933 1099
948cf::attachable->attach ( 1114cf::attachable->attach (
949 prio => -1000000, 1115 prio => -1000000,
950 on_instantiate => sub { 1116 on_instantiate => sub {
951 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
952 1118
953 $data = from_json $data; 1119 $data = decode_json $data;
954 1120
955 for (@$data) { 1121 for (@$data) {
956 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
957 1123
958 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1140sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
976 1142
977 sync_job { 1143 sync_job {
978 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
981 1148
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1153 aio_close $fh;
987 1154
988 if (@$objs) { 1155 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1161 aio_close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
996 } 1163 }
997 } else { 1164 } else {
998 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
999 } 1166 }
1000 1167
1001 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1002 } else { 1172 } else {
1003 warn "FATAL: $filename~: $!\n"; 1173 warn "FATAL: $filename~: $!\n";
1004 } 1174 }
1005 } else { 1175 } else {
1006 aio_unlink $filename; 1176 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1008 } 1178 }
1009 } 1179 };
1010} 1180}
1011 1181
1012sub object_freezer_as_string { 1182sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
1014 1184
1026 or return; 1196 or return;
1027 1197
1028 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1200 or return;
1201
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1032 } 1204 }
1033 1205
1206 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
1036 return ($data, $av); 1210 ($data, $av)
1037} 1211}
1038 1212
1039=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1040 1214
1041=over 4 1215=over 4
1095 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1096 1270
1097 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1098} 1272}
1099 1273
1274use File::Glob ();
1275
1100cf::player->attach ( 1276cf::player->attach (
1101 on_command => sub { 1277 on_command => sub {
1102 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1103 1279
1104 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1114 my ($pl, $buf) = @_; 1290 my ($pl, $buf) = @_;
1115 1291
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1293
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1302 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1303 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1304 }
1305
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1124 } else { 1309 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1311 }
1127 1312
1128 cf::override; 1313 cf::override;
1129 }, 1314 },
1130); 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}
1131 1329
1132sub load_extensions { 1330sub load_extensions {
1133 cf::sync_job { 1331 cf::sync_job {
1134 my %todo; 1332 my %todo;
1135 1333
1155 1353
1156 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1157 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1158 1356
1159 $ext{source} = 1357 $ext{source} =
1160 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1161 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1162 . $source 1360 . $source
1163 . "\n};\n1"; 1361 . "\n};\n1";
1164 1362
1165 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1181 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1183 1381
1184 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1383 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1385 }
1189 1386
1190 warn $msg; 1387 warn $msg;
1191 } 1388 }
1192 1389
1206 1403
1207=back 1404=back
1208 1405
1209=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1210 1407
1211Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1212 1409
1213=cut 1410=cut
1214 1411
1215package cf::player; 1412package cf::player;
1216 1413
1217use Coro::AIO; 1414use Coro::AIO;
1218 1415
1219=head3 cf::player 1416=head3 cf::player
1220 1417
1221=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}
1222 1433
1223=item cf::player::find $login 1434=item cf::player::find $login
1224 1435
1225Returns the given player object, loading it if necessary (might block). 1436Returns the given player object, loading it if necessary (might block).
1226 1437
1245 1456
1246sub exists($) { 1457sub exists($) {
1247 my ($login) = @_; 1458 my ($login) = @_;
1248 1459
1249 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1250 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1251} 1462}
1252 1463
1253sub find($) { 1464sub find($) {
1254 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1255 my $login = $_[0]; 1466 my $login = $_[0];
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1473 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1474 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1475 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1477
1267 my $pl = load_pl path $login 1478 my $f = new_from_file cf::object::thawer path $login
1268 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;
1269 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1270 } 1487 }
1271 } 1488 }
1272} 1489}
1273 1490
1282 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1283 1500
1284 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1286 1503
1504 cf::get_slot 0.01;
1505
1287 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1288 Coro::cede; 1507 cf::cede_to_tick;
1289} 1508}
1290 1509
1291sub new($) { 1510sub new($) {
1292 my ($login) = @_; 1511 my ($login) = @_;
1293 1512
1299 $cf::PLAYER{$login} = $self; 1518 $cf::PLAYER{$login} = $self;
1300 1519
1301 $self 1520 $self
1302} 1521}
1303 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
1304=item $pl->quit_character 1533=item $pl->quit_character
1305 1534
1306Nukes the player without looking back. If logged in, the connection will 1535Nukes the player without looking back. If logged in, the connection will
1307be destroyed. May block for a long time. 1536be destroyed. May block for a long time.
1308 1537
1312 my ($pl) = @_; 1541 my ($pl) = @_;
1313 1542
1314 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1315 1544
1316 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1317 $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
1318 1547
1319 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1320 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1321 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1322 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1323 1554
1324 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1325 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1361 or return []; 1592 or return [];
1362 1593
1363 my @logins; 1594 my @logins;
1364 1595
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1605 }
1369 1606
1370 utf8::decode $login; 1607 utf8::decode $login;
1371 push @logins, $login; 1608 push @logins, $login;
1372 } 1609 }
1373 1610
1400 } 1637 }
1401 1638
1402 \@paths 1639 \@paths
1403} 1640}
1404 1641
1405=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1406 1643
1407Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1408 1645
1409=cut
1410
1411sub expand_cfpod {
1412 ((my $self), (local $_)) = @_;
1413
1414 # escape & and <
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417
1418 # this is buggy, it needs to properly take care of nested <'s
1419
1420 1 while
1421 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/
1425 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1
1428 }ge
1429 # replace H<hint text>
1430 || s{H<([^\>]*)>}
1431 {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "")
1435 [$self->{hintmode}]
1436 }ge;
1437
1438 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g;
1440
1441 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1446
1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1453}
1454
1455=item $player->ext_reply ($msgid, %msg) 1646=item $player->ext_reply ($msgid, @msg)
1456 1647
1457Sends an ext reply to the player. 1648Sends an ext reply to the player.
1458 1649
1459=cut 1650=cut
1460 1651
1461sub ext_reply($$%) { 1652sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1653 my ($self, $id, @msg) = @_;
1463 1654
1464 $msg{msgid} = $id; 1655 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1656}
1467 1657
1468=item $player->ext_event ($type, %msg) 1658=item $player->ext_msg ($type, @msg)
1469 1659
1470Sends an ext event to the client. 1660Sends an ext event to the client.
1471 1661
1472=cut 1662=cut
1473 1663
1474sub ext_event($$%) { 1664sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1665 my ($self, $type, @msg) = @_;
1476 1666
1477 $self->ns->ext_event ($type, %msg); 1667 $self->ns->ext_msg ($type, @msg);
1478} 1668}
1479 1669
1480=head3 cf::region 1670=head3 cf::region
1481 1671
1482=over 4 1672=over 4
1526our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1527our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1528 1718
1529sub generate_random_map { 1719sub generate_random_map {
1530 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
1531 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1532 $self->_create_random_map ( 1725 $self->_create_random_map (
1533 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1534 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1535 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1657 1850
1658# the temporary/swap location 1851# the temporary/swap location
1659sub save_path { 1852sub save_path {
1660 my ($self) = @_; 1853 my ($self) = @_;
1661 1854
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1664} 1857}
1665 1858
1666# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1667sub uniq_path { 1860sub uniq_path {
1668 my ($self) = @_; 1861 my ($self) = @_;
1669 1862
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1672} 1865}
1673 1866
1674# and all this just because we cannot iterate over 1867# and all this just because we cannot iterate over
1675# all maps in C++... 1868# all maps in C++...
1698 1891
1699sub load_header_from($) { 1892sub load_header_from($) {
1700 my ($self, $path) = @_; 1893 my ($self, $path) = @_;
1701 1894
1702 utf8::encode $path; 1895 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1896 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1897 or return;
1898
1899 $self->_load_header ($f)
1900 or return;
1901
1902 local $MAP_LOADING{$self->{path}} = $self;
1903 $f->resolve_delayed_derefs;
1708 1904
1709 $self->{load_path} = $path; 1905 $self->{load_path} = $path;
1710 1906
1711 1 1907 1
1712} 1908}
1766sub find { 1962sub find {
1767 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
1768 1964
1769 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
1770 1966
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
1772 1969
1773 $cf::MAP{$path} || do { 1970 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path";
1775 my $map = new_from_path cf::map $path 1971 my $map = new_from_path cf::map $path
1776 or return; 1972 or return;
1777 1973
1778 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
1779 1975
1781 or return; 1977 or return;
1782 1978
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1979 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 1980 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 1981 #$cf::WAIT_FOR_TICK->wait;
1982 undef $guard2;
1983 undef $guard1;
1786 $map->reset; 1984 $map->reset;
1787 undef $guard;
1788 return find $path; 1985 return find $path;
1789 } 1986 }
1790 1987
1791 $cf::MAP{$path} = $map 1988 $cf::MAP{$path} = $map
1792 } 1989 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 1998 local $self->{deny_reset} = 1; # loading can take a long time
1802 1999
1803 my $path = $self->{path}; 2000 my $path = $self->{path};
1804 2001
1805 { 2002 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2003 my $guard = cf::lock_acquire "map_data:$path";
1807 2004
2005 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2006 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2007
1810 $self->in_memory (cf::MAP_LOADING); 2008 $self->in_memory (cf::MAP_LOADING);
1811 2009
1812 $self->alloc; 2010 $self->alloc;
1813 2011
1814 $self->pre_load; 2012 $self->pre_load;
1815 Coro::cede; 2013 cf::cede_to_tick;
1816 2014
2015 my $f = new_from_file cf::object::thawer $self->{load_path};
2016 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2017 $self->_load_objects ($f)
1818 or return; 2018 or return;
1819 2019
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2020 $self->post_load_original
1821 if delete $self->{load_original}; 2021 if delete $self->{load_original};
1822 2022
1823 if (my $uniq = $self->uniq_path) { 2023 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2024 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2025 unless (aio_stat $uniq) {
2026 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2027 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2028 $self->_load_objects ($f);
2029 $f->resolve_delayed_derefs;
2030 }
1828 } 2031 }
1829 } 2032 }
1830 2033
1831 Coro::cede; 2034 $f->resolve_delayed_derefs;
2035
2036 cf::cede_to_tick;
1832 # now do the right thing for maps 2037 # now do the right thing for maps
1833 $self->link_multipart_objects; 2038 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2039 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2040 unless $self->difficulty;
1836 Coro::cede; 2041 cf::cede_to_tick;
1837 2042
1838 unless ($self->{deny_activate}) { 2043 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2044 $self->decay_objects;
1840 $self->fix_auto_apply; 2045 $self->fix_auto_apply;
1841 $self->update_buttons; 2046 $self->update_buttons;
1842 Coro::cede; 2047 cf::cede_to_tick;
1843 $self->set_darkness_map; 2048 $self->set_darkness_map;
1844 Coro::cede; 2049 cf::cede_to_tick;
1845 $self->activate; 2050 $self->activate;
1846 } 2051 }
1847 2052
2053 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME);
2055
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2056 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2057 }
1850 2058
1851 $self->post_load; 2059 $self->post_load;
1852} 2060}
1853 2061
1862 2070
1863 $self 2071 $self
1864} 2072}
1865 2073
1866# find and load all maps in the 3x3 area around a map 2074# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2075sub load_neighbours {
1868 my ($map) = @_; 2076 my ($map) = @_;
1869 2077
1870 my @diag; # diagonal neighbours 2078 my @neigh; # diagonal neighbours
1871 2079
1872 for (0 .. 3) { 2080 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2081 my $neigh = $map->tile_path ($_)
1874 or next; 2082 or next;
1875 $neigh = find $neigh, $map 2083 $neigh = find $neigh, $map
1876 or next; 2084 or next;
1877 $neigh->load; 2085 $neigh->load;
1878 2086
2087 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2088 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2089 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2090 }
1882 2091
1883 for (@diag) { 2092 for (grep defined $_->[0], @neigh) {
2093 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2094 my $neigh = find $path, $origin
1885 or next; 2095 or next;
1886 $neigh->load; 2096 $neigh->load;
1887 } 2097 }
1888} 2098}
1889 2099
1894} 2104}
1895 2105
1896sub do_load_sync { 2106sub do_load_sync {
1897 my ($map) = @_; 2107 my ($map) = @_;
1898 2108
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main;
2111
1899 cf::sync_job { $map->load }; 2112 cf::sync_job { $map->load };
1900} 2113}
1901 2114
1902our %MAP_PREFETCH; 2115our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2116our $MAP_PREFETCHER = undef;
1904 2117
1905sub find_async { 2118sub find_async {
1906 my ($path, $origin) = @_; 2119 my ($path, $origin, $load) = @_;
1907 2120
1908 $path = normalise $path, $origin && $origin->{path}; 2121 $path = normalise $path, $origin && $origin->{path};
1909 2122
1910 if (my $map = $cf::MAP{$path}) { 2123 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2125 }
1913 2126
1914 undef $MAP_PREFETCH{$path}; 2127 $MAP_PREFETCH{$path} |= $load;
2128
1915 $MAP_PREFETCHER ||= cf::async { 2129 $MAP_PREFETCHER ||= cf::async {
2130 $Coro::current->{desc} = "map prefetcher";
2131
1916 while (%MAP_PREFETCH) { 2132 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2133 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2134 if (my $map = find $k) {
1919 $map->load; 2135 $map->load if $v;
1920 } 2136 }
1921 2137
1922 delete $MAP_PREFETCH{$path}; 2138 delete $MAP_PREFETCH{$k};
1923 } 2139 }
1924 } 2140 }
1925 undef $MAP_PREFETCHER; 2141 undef $MAP_PREFETCHER;
1926 }; 2142 };
1927 $MAP_PREFETCHER->prio (6); 2143 $MAP_PREFETCHER->prio (6);
1930} 2146}
1931 2147
1932sub save { 2148sub save {
1933 my ($self) = @_; 2149 my ($self) = @_;
1934 2150
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2152
1937 $self->{last_save} = $cf::RUNTIME; 2153 $self->{last_save} = $cf::RUNTIME;
1938 2154
1939 return unless $self->dirty; 2155 return unless $self->dirty;
1940 2156
1946 return if $self->{deny_save}; 2162 return if $self->{deny_save};
1947 2163
1948 local $self->{last_access} = $self->last_access;#d# 2164 local $self->{last_access} = $self->last_access;#d#
1949 2165
1950 cf::async { 2166 cf::async {
2167 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2168 $_->contr->save for $self->players;
1952 }; 2169 };
2170
2171 cf::get_slot 0.02;
1953 2172
1954 if ($uniq) { 2173 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2174 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2175 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2176 } else {
1963 my ($self) = @_; 2182 my ($self) = @_;
1964 2183
1965 # save first because save cedes 2184 # save first because save cedes
1966 $self->save; 2185 $self->save;
1967 2186
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2188
1970 return if $self->players; 2189 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2190 return if $self->in_memory != cf::MAP_ACTIVE;
1972 return if $self->{deny_save}; 2191 return if $self->{deny_save};
1973 2192
2193 $self->in_memory (cf::MAP_SWAPPED);
2194
2195 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2197 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2198}
1977 2199
1978sub reset_at { 2200sub reset_at {
1979 my ($self) = @_; 2201 my ($self) = @_;
1980 2202
2012 if $uniq; 2234 if $uniq;
2013 } 2235 }
2014 2236
2015 delete $cf::MAP{$self->path}; 2237 delete $cf::MAP{$self->path};
2016 2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2241 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2242
2021 $self->unlink_save; 2243 $self->unlink_save;
2022 $self->destroy; 2244 $self->destroy;
2023} 2245}
2024 2246
2025my $nuke_counter = "aaaa"; 2247my $nuke_counter = "aaaa";
2026 2248
2027sub nuke { 2249sub nuke {
2028 my ($self) = @_; 2250 my ($self) = @_;
2029 2251
2252 {
2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254
2030 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
2031 2256
2032 $self->unlink_save; 2257 $self->unlink_save;
2033 2258
2034 bless $self, "cf::map"; 2259 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2260 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2261 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2262 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2264
2040 $cf::MAP{$self->path} = $self; 2265 $cf::MAP{$self->path} = $self;
2266 }
2041 2267
2042 $self->reset; # polite request, might not happen 2268 $self->reset; # polite request, might not happen
2043} 2269}
2044 2270
2045=item $maps = cf::map::tmp_maps 2271=item $maps = cf::map::tmp_maps
2087 2313
2088sub unique_maps() { 2314sub unique_maps() {
2089 [ 2315 [
2090 map { 2316 map {
2091 utf8::decode $_; 2317 utf8::decode $_;
2092 /\.map$/ 2318 s/\.map$//; # TODO future compatibility hack
2319 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2320 ? ()
2093 ? normalise $_ 2321 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2322 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2323 ]
2097} 2324}
2098 2325
2099package cf;
2100
2101=back 2326=back
2102 2327
2103=head3 cf::object 2328=head3 cf::object
2104 2329
2105=cut 2330=cut
2108 2333
2109=over 4 2334=over 4
2110 2335
2111=item $ob->inv_recursive 2336=item $ob->inv_recursive
2112 2337
2113Returns the inventory of the object _and_ their inventories, recursively. 2338Returns the inventory of the object I<and> their inventories, recursively,
2339but I<not> the object itself.
2114 2340
2115=cut 2341=cut
2116 2342
2117sub inv_recursive_; 2343sub inv_recursive_;
2118sub inv_recursive_ { 2344sub inv_recursive_ {
2121 2347
2122sub inv_recursive { 2348sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2349 inv_recursive_ inv $_[0]
2124} 2350}
2125 2351
2352=item $ref = $ob->ref
2353
2354Creates and returns a persistent reference to an object that can be stored as a string.
2355
2356=item $ob = cf::object::deref ($refstring)
2357
2358returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2359even if the object actually exists. May block.
2360
2361=cut
2362
2363sub deref {
2364 my ($ref) = @_;
2365
2366 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2367 my ($uuid, $name) = ($1, $2);
2368 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2369 or return;
2370 $pl->ob->uuid eq $uuid
2371 or return;
2372
2373 $pl->ob
2374 } else {
2375 warn "$ref: cannot resolve object reference\n";
2376 undef
2377 }
2378}
2379
2126package cf; 2380package cf;
2127 2381
2128=back 2382=back
2129 2383
2130=head3 cf::object::player 2384=head3 cf::object::player
2136Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2390Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2137can be C<undef>. Does the right thing when the player is currently in a 2391can be C<undef>. Does the right thing when the player is currently in a
2138dialogue with the given NPC character. 2392dialogue with the given NPC character.
2139 2393
2140=cut 2394=cut
2395
2396our $SAY_CHANNEL = {
2397 id => "say",
2398 title => "Map",
2399 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2401};
2402
2403our $CHAT_CHANNEL = {
2404 id => "chat",
2405 title => "Chat",
2406 reply => "chat ",
2407 tooltip => "Player chat and shouts, global to the server.",
2408};
2141 2409
2142# rough implementation of a future "reply" method that works 2410# rough implementation of a future "reply" method that works
2143# with dialog boxes. 2411# with dialog boxes.
2144#TODO: the first argument must go, split into a $npc->reply_to ( method 2412#TODO: the first argument must go, split into a $npc->reply_to ( method
2145sub cf::object::player::reply($$$;$) { 2413sub cf::object::player::reply($$$;$) {
2152 2420
2153 } else { 2421 } else {
2154 my $pl = $self->contr; 2422 my $pl = $self->contr;
2155 2423
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2424 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2425 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2426 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2427
2165 } else { 2428 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2429 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2430 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2168 } 2431 }
2169 } 2432 }
2433}
2434
2435=item $object->send_msg ($channel, $msg, $color, [extra...])
2436
2437=cut
2438
2439sub cf::object::send_msg {
2440 my $pl = shift->contr
2441 or return;
2442 $pl->send_msg (@_);
2170} 2443}
2171 2444
2172=item $player_object->may ("access") 2445=item $player_object->may ("access")
2173 2446
2174Returns wether the given player is authorized to access resource "access" 2447Returns wether the given player is authorized to access resource "access"
2187 2460
2188=item $player_object->enter_link 2461=item $player_object->enter_link
2189 2462
2190Freezes the player and moves him/her to a special map (C<{link}>). 2463Freezes the player and moves him/her to a special map (C<{link}>).
2191 2464
2192The player should be reasonably safe there for short amounts of time. You 2465The player should be reasonably safe there for short amounts of time (e.g.
2193I<MUST> call C<leave_link> as soon as possible, though. 2466for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link
2468map.
2194 2469
2195Will never block. 2470Will never block.
2196 2471
2197=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2198 2473
2253 # use -1 or undef as default coordinates, not 0, 0 2528 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2529 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2530 if $x <=0 && $y <= 0;
2256 2531
2257 $map->load; 2532 $map->load;
2258 $map->load_diag; 2533 $map->load_neighbours;
2259 2534
2260 return unless $self->contr->active; 2535 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2261 $self->activate_recursive; 2537 $self->activate_recursive;
2262 2538
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2264 $self->enter_map ($map, $x, $y); 2540 $self->enter_map ($map, $x, $y);
2265} 2541}
2270her, loading and preparing them map, calling the provided $check callback 2546her, loading and preparing them map, calling the provided $check callback
2271that has to return the map if sucecssful, and then unfreezes the player on 2547that has to return the map if sucecssful, and then unfreezes the player on
2272the new (success) or old (failed) map position. In either case, $done will 2548the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process. 2549be called at the end of this process.
2274 2550
2551Note that $check will be called with a potentially non-loaded map, so if
2552it needs a loaded map it has to call C<< ->load >>.
2553
2275=cut 2554=cut
2276 2555
2277our $GOTOGEN; 2556our $GOTOGEN;
2278 2557
2279sub cf::object::player::goto { 2558sub cf::object::player::goto {
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2563
2285 $self->enter_link; 2564 $self->enter_link;
2286 2565
2287 (async { 2566 (async {
2567 $Coro::current->{desc} = "player::goto $path $x $y";
2568
2569 # *tag paths override both path and x|y
2570 if ($path =~ /^\*(.*)$/) {
2571 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2572 my $ob = $obs[rand @obs];
2573
2574 # see if we actually can go there
2575 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2576 $ob = $obs[rand @obs];
2577 } else {
2578 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2579 }
2580 # else put us there anyways for now #d#
2581
2582 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2583 } else {
2584 ($path, $x, $y) = (undef, undef, undef);
2585 }
2586 }
2587
2288 my $map = eval { 2588 my $map = eval {
2289 my $map = cf::map::find $path; 2589 my $map = defined $path ? cf::map::find $path : undef;
2290 2590
2291 if ($map) { 2591 if ($map) {
2292 $map = $map->customise_for ($self); 2592 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2593 $map = $check->($map) if $check && $map;
2294 } else { 2594 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2596 }
2297 2597
2298 $map 2598 $map
2299 }; 2599 };
2300 2600
2336} 2636}
2337 2637
2338sub prepare_random_map { 2638sub prepare_random_map {
2339 my ($exit) = @_; 2639 my ($exit) = @_;
2340 2640
2341 my $guard = cf::lock_acquire "exit_prepare:$exit";
2342
2343 # all this does is basically replace the /! path by 2641 # all this does is basically replace the /! path by
2344 # a new random map path (?random/...) with a seed 2642 # a new random map path (?random/...) with a seed
2345 # that depends on the exit object 2643 # that depends on the exit object
2346 2644
2347 my $rmp = parse_random_map_params $exit->msg; 2645 my $rmp = parse_random_map_params $exit->msg;
2349 if ($exit->map) { 2647 if ($exit->map) {
2350 $rmp->{region} = $exit->region->name; 2648 $rmp->{region} = $exit->region->name;
2351 $rmp->{origin_map} = $exit->map->path; 2649 $rmp->{origin_map} = $exit->map->path;
2352 $rmp->{origin_x} = $exit->x; 2650 $rmp->{origin_x} = $exit->x;
2353 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2652
2653 $exit->map->touch;
2354 } 2654 }
2355 2655
2356 $rmp->{random_seed} ||= $exit->random_seed; 2656 $rmp->{random_seed} ||= $exit->random_seed;
2357 2657
2358 my $data = cf::to_json $rmp; 2658 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2659 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2660 my $meta = "$RANDOMDIR/$md5.meta";
2361 2661
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2662 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2663 aio_write $fh, 0, (length $data), $data, 0;
2364 undef $fh; 2664 undef $fh;
2365 aio_rename "$meta~", $meta; 2665 aio_rename "$meta~", $meta;
2366 2666
2667 my $slaying = "?random/$md5";
2668
2669 if ($exit->valid) {
2367 $exit->slaying ("?random/$md5"); 2670 $exit->slaying ("?random/$md5");
2368 $exit->msg (undef); 2671 $exit->msg (undef);
2672 }
2369 } 2673 }
2370} 2674}
2371 2675
2372sub cf::object::player::enter_exit { 2676sub cf::object::player::enter_exit {
2373 my ($self, $exit) = @_; 2677 my ($self, $exit) = @_;
2374 2678
2375 return unless $self->type == cf::PLAYER; 2679 return unless $self->type == cf::PLAYER;
2376 2680
2377 if ($exit->slaying eq "/!") {
2378 #TODO: this should de-fi-ni-te-ly not be a sync-job
2379 # the problem is that $exit might not survive long enough
2380 # so it needs to be done right now, right here
2381 cf::sync_job { prepare_random_map $exit };
2382 }
2383
2384 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2385 my $hp = $exit->stats->hp;
2386 my $sp = $exit->stats->sp;
2387
2388 $self->enter_link; 2681 $self->enter_link;
2389 2682
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2394 (async { 2683 (async {
2395 $self->deactivate_recursive; # just to be sure 2684 $Coro::current->{desc} = "enter_exit";
2685
2396 unless (eval { 2686 unless (eval {
2687 $self->deactivate_recursive; # just to be sure
2688
2689 # random map handling
2690 {
2691 my $guard = cf::lock_acquire "exit_prepare:$exit";
2692
2693 prepare_random_map $exit
2694 if $exit->slaying eq "/!";
2695 }
2696
2697 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2698 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp;
2700
2397 $self->goto ($slaying, $hp, $sp); 2701 $self->goto ($map, $x, $y);
2398 2702
2703 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y)
2705 if $exit->flag (cf::FLAG_DAMNED);
2706
2399 1; 2707 1
2400 }) { 2708 }) {
2401 $self->message ("Something went wrong deep within the crossfire server. " 2709 $self->message ("Something went wrong deep within the deliantra server. "
2402 . "I'll try to bring you back to the map you were before. " 2710 . "I'll try to bring you back to the map you were before. "
2403 . "Please report this to the dungeon master!", 2711 . "Please report this to the dungeon master!",
2404 cf::NDI_UNIQUE | cf::NDI_RED); 2712 cf::NDI_UNIQUE | cf::NDI_RED);
2405 2713
2406 warn "ERROR in enter_exit: $@"; 2714 warn "ERROR in enter_exit: $@";
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2742the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2743the message unless the client supports the msg packet.
2436 2744
2437=cut 2745=cut
2438 2746
2747# non-persistent channels (usually the info channel)
2748our %CHANNEL = (
2749 "c/identify" => {
2750 id => "infobox",
2751 title => "Identify",
2752 reply => undef,
2753 tooltip => "Items recently identified",
2754 },
2755 "c/examine" => {
2756 id => "infobox",
2757 title => "Examine",
2758 reply => undef,
2759 tooltip => "Signs and other items you examined",
2760 },
2761 "c/book" => {
2762 id => "infobox",
2763 title => "Book",
2764 reply => undef,
2765 tooltip => "The contents of a note or book",
2766 },
2767 "c/lookat" => {
2768 id => "infobox",
2769 title => "Look",
2770 reply => undef,
2771 tooltip => "What you saw there",
2772 },
2773 "c/who" => {
2774 id => "infobox",
2775 title => "Players",
2776 reply => undef,
2777 tooltip => "Shows players who are currently online",
2778 },
2779 "c/body" => {
2780 id => "infobox",
2781 title => "Body Parts",
2782 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available",
2784 },
2785 "c/skills" => {
2786 id => "infobox",
2787 title => "Skills",
2788 reply => undef,
2789 tooltip => "Shows your experience per skill and item power",
2790 },
2791 "c/uptime" => {
2792 id => "infobox",
2793 title => "Uptime",
2794 reply => undef,
2795 tooltip => "How long the server has been running since last restart",
2796 },
2797 "c/mapinfo" => {
2798 id => "infobox",
2799 title => "Map Info",
2800 reply => undef,
2801 tooltip => "Information related to the maps",
2802 },
2803 "c/party" => {
2804 id => "party",
2805 title => "Party",
2806 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party",
2808 },
2809);
2810
2439sub cf::client::send_msg { 2811sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2812 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2813
2442 $msg = $self->pl->expand_cfpod ($msg); 2814 $msg = $self->pl->expand_cfpod ($msg)
2815 unless $color & cf::NDI_VERBATIM;
2443 2816
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2817 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 2818
2819 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel};
2822
2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id};
2827
2448 if (ref $channel) { 2828 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2829 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2830 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2831 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2832 $self->ext_msg (channel_info => $channel)
2833 if $self->can_msg;
2453 } 2834 }
2454 2835
2455 $channel = $channel->{id}; 2836 $channel = $channel->{id};
2456 } 2837 }
2457 2838
2839 return unless @extra || length $msg;
2840
2458 if ($self->can_msg) { 2841 if ($self->can_msg) {
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2842 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF;
2845
2846 my $pkt = "msg "
2847 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 );
2850
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt);
2460 } else { 2862 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) { 2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2472 if (0 && $msg =~ /\[/) { 2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2881 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2883 $self->send_packet ("drawinfo $color $msg")
2477 } 2884 }
2478 } 2885 }
2479 } 2886 }
2480} 2887}
2481 2888
2482=item $client->ext_event ($type, %msg) 2889=item $client->ext_msg ($type, @msg)
2483 2890
2484Sends an ext event to the client. 2891Sends an ext event to the client.
2485 2892
2486=cut 2893=cut
2487 2894
2488sub cf::client::ext_event($$%) { 2895sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2896 my ($self, $type, @msg) = @_;
2490 2897
2491 return unless $self->extcmd; 2898 if ($self->extcmd == 2) {
2492 2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2901 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 }
2904}
2905
2906=item $client->ext_reply ($msgid, @msg)
2907
2908Sends an ext reply to the client.
2909
2910=cut
2911
2912sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_;
2914
2915 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 }
2495} 2922}
2496 2923
2497=item $success = $client->query ($flags, "text", \&cb) 2924=item $success = $client->query ($flags, "text", \&cb)
2498 2925
2499Queues a query to the client, calling the given callback with 2926Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 2981 my ($ns, $buf) = @_;
2555 2982
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2983 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2984
2558 if (ref $msg) { 2985 if (ref $msg) {
2986 my ($type, $reply, @payload) =
2987 "ARRAY" eq ref $msg
2988 ? @$msg
2989 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2990
2991 my @reply;
2992
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2993 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2994 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2995 }
2996
2997 $ns->ext_reply ($reply, @reply)
2998 if $reply;
2999
2565 } else { 3000 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 3002 }
2568 3003
2569 cf::override; 3004 cf::override;
2616our $safe = new Safe "safe"; 3051our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3052our $safe_hole = new Safe::Hole;
2618 3053
2619$SIG{FPE} = 'IGNORE'; 3054$SIG{FPE} = 'IGNORE';
2620 3055
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3056$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math
3058 grepstart grepwhile mapstart mapwhile
3059 sort time
3060));
2622 3061
2623# here we export the classes and methods available to script code 3062# here we export the classes and methods available to script code
2624 3063
2625=pod 3064=pod
2626 3065
2627The following functions and methods are available within a safe environment: 3066The following functions and methods are available within a safe environment:
2628 3067
2629 cf::object 3068 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 3069 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 3070 insert remove name archname title slaying race decrease split
2632 3071
2633 cf::object::player 3072 cf::object::player
2634 player 3073 player
2635 3074
2636 cf::player 3075 cf::player
2641 3080
2642=cut 3081=cut
2643 3082
2644for ( 3083for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)], 3085 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)],
2647 ["cf::object::player" => qw(player)], 3087 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3088 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 3089 ["cf::map" => qw(trigger)],
2650) { 3090) {
2651 no strict 'refs'; 3091 no strict 'refs';
2727# the server's init and main functions 3167# the server's init and main functions
2728 3168
2729sub load_facedata($) { 3169sub load_facedata($) {
2730 my ($path) = @_; 3170 my ($path) = @_;
2731 3171
3172 # HACK to clear player env face cache, we need some signal framework
3173 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = ();
3175
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177
2732 warn "loading facedata from $path\n"; 3178 warn "loading facedata from $path\n";
2733 3179
2734 my $facedata; 3180 my $facedata;
2735 0 < aio_load $path, $facedata 3181 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3182 or die "$path: $!";
2738 $facedata = Coro::Storable::thaw $facedata; 3184 $facedata = Coro::Storable::thaw $facedata;
2739 3185
2740 $facedata->{version} == 2 3186 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3187 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 3188
3189 # patch in the exptable
3190 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC,
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3193 };
3194 cf::cede_to_tick;
3195
2743 { 3196 {
2744 my $faces = $facedata->{faceinfo}; 3197 my $faces = $facedata->{faceinfo};
2745 3198
2746 while (my ($face, $info) = each %$faces) { 3199 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3200 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201
2748 cf::face::set_visibility $idx, $info->{visibility}; 3202 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3203 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3206
2753 cf::cede_to_tick; 3207 cf::cede_to_tick;
2754 } 3208 }
2755 3209
2756 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3211 next unless $info->{smooth};
3212
2758 my $idx = cf::face::find $face 3213 my $idx = cf::face::find $face
2759 or next; 3214 or next;
3215
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3216 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3217 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3219 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3220 warn "smooth face '$info->{smooth}' not found for face '$face'";
2781 3237
2782 { 3238 {
2783 # TODO: for gcfclient pleasure, we should give resources 3239 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3240 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3241 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3242
2788 while (my ($name, $info) = each %$res) { 3243 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3244 if (defined $info->{type}) {
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3245 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
2796 3247
2797 if ($name =~ /\.jpg$/) { 3248 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3249 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type};
2800 } else { 3263 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3264 $RESOURCE{$name} = $info;
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3265 }
2807 3266
2808 cf::cede_to_tick; 3267 cf::cede_to_tick;
2809 } 3268 }
2810 } 3269 }
2811 3270
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272
2812 1 3273 1
2813} 3274}
2814 3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3295
3296register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_;
3298
3299 while (my ($k, $v) = each %$want) {
3300 $ns->fx_want ($k, $v);
3301 }
3302};
3303
3304sub load_resource_file($) {
3305 my $guard = lock_acquire "load_resource_file";
3306
3307 my $status = load_resource_file_ $_[0];
3308 get_slot 0.1, 100;
3309 cf::arch::commit_load;
3310
3311 $status
3312}
3313
2815sub reload_regions { 3314sub reload_regions {
3315 # HACK to clear player env face cache, we need some signal framework
3316 # for this (global event?)
3317 %ext::player_env::MUSIC_FACE_CACHE = ();
3318
2816 load_resource_file "$MAPDIR/regions" 3319 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3320 or die "unable to load regions file\n";
2818 3321
2819 for (cf::region::list) { 3322 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3323 $_->{match} = qr/$_->{match}/
2828} 3331}
2829 3332
2830sub reload_archetypes { 3333sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes" 3334 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n"; 3335 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2836 load_resource_file "$DATADIR/archetypes"
2837 or die "unable to load archetypes\n";
2838} 3336}
2839 3337
2840sub reload_treasures { 3338sub reload_treasures {
2841 load_resource_file "$DATADIR/treasures" 3339 load_resource_file "$DATADIR/treasures"
2842 or die "unable to load treasurelists\n"; 3340 or die "unable to load treasurelists\n";
2843} 3341}
2844 3342
2845sub reload_resources { 3343sub reload_resources {
2846 warn "reloading resource files...\n"; 3344 warn "reloading resource files...\n";
2847 3345
3346 reload_facedata;
3347 reload_archetypes;
2848 reload_regions; 3348 reload_regions;
2849 reload_facedata;
2850 #reload_archetypes;#d#
2851 reload_archetypes;
2852 reload_treasures; 3349 reload_treasures;
2853 3350
2854 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
2855} 3352}
2856 3353
2857sub init { 3354sub reload_config {
2858 reload_resources;
2859}
2860
2861sub cfg_load {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3356 or return;
2864 3357
2865 local $/; 3358 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3359 *CFG = YAML::Load <$fh>;
2867 3360
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2869 3362
2870 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2871 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2877 }; 3370 };
2878 warn $@ if $@; 3371 warn $@ if $@;
2879 } 3372 }
2880} 3373}
2881 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
2882sub main { 3394sub main {
3395 cf::init_globals; # initialise logging
3396
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409
2883 # we must not ever block the main coroutine 3410 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3411 local $Coro::idle = sub {
2885 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3412 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886 (async { 3413 (async {
2887 Event::one_event; 3414 $Coro::current->{desc} = "IDLE BUG HANDLER";
3415 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3416 })->prio (Coro::PRIO_MAX);
2889 }; 3417 };
2890 3418
2891 cfg_load; 3419 evthread_start IO::AIO::poll_fileno;
3420
3421 cf::sync_job {
3422 reload_resources;
3423 reload_config;
2892 db_init; 3424 db_init;
3425
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid;
3429 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills;
3432
3433 cf::init_beforeplay;
3434
3435 atomic;
3436
2893 load_extensions; 3437 load_extensions;
2894 3438
2895 $TICK_WATCHER->start; 3439 utime time, time, $RUNTIMEFILE;
3440
3441 # no (long-running) fork's whatsoever before this point(!)
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443
3444 (pop @POST_INIT)->(0) while @POST_INIT;
3445 };
3446
2896 Event::loop; 3447 EV::loop;
2897} 3448}
2898 3449
2899############################################################################# 3450#############################################################################
2900# initialisation and cleanup 3451# initialisation and cleanup
2901 3452
2902# install some emergency cleanup handlers 3453# install some emergency cleanup handlers
2903BEGIN { 3454BEGIN {
3455 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3456 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3457 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2906 reentrant => 0,
2907 data => WF_AUTOCANCEL,
2908 signal => $signal,
2909 prio => 0,
2910 cb => sub {
2911 cf::cleanup "SIG$signal"; 3458 cf::cleanup "SIG$signal";
2912 },
2913 ); 3459 };
2914 } 3460 }
2915} 3461}
2916 3462
2917sub write_runtime { 3463sub write_runtime_sync {
2918 my $runtime = "$LOCALDIR/runtime";
2919
2920 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
2921 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
2922 3466
2923 IO::AIO::aio_utime $runtime, undef, undef; 3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2924 3468
2925 my $guard = cf::lock_acquire "write_runtime"; 3469 my $guard = cf::lock_acquire "write_runtime";
2926 3470
2927 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2928 or return; 3472 or return;
2929 3473
2930 my $value = $cf::RUNTIME + 90 + 10; 3474 my $value = $cf::RUNTIME + 90 + 10;
2931 # 10 is the runtime save interval, for a monotonic clock 3475 # 10 is the runtime save interval, for a monotonic clock
2932 # 60 allows for the watchdog to kill the server. 3476 # 60 allows for the watchdog to kill the server.
2942 aio_utime $fh, undef, undef; 3486 aio_utime $fh, undef, undef;
2943 3487
2944 close $fh 3488 close $fh
2945 or return; 3489 or return;
2946 3490
2947 aio_rename "$runtime~", $runtime 3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2948 and return; 3492 and return;
2949 3493
2950 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
2951 3495
2952 1 3496 1
3497}
3498
3499our $uuid_lock;
3500our $uuid_skip;
3501
3502sub write_uuid_sync($) {
3503 $uuid_skip ||= $_[0];
3504
3505 return if $uuid_lock;
3506 local $uuid_lock = 1;
3507
3508 my $uuid = "$LOCALDIR/uuid";
3509
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return;
3512
3513 my $value = uuid_seq uuid_cur;
3514
3515 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n";
3517 return;
3518 }
3519
3520 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
2953} 3547}
2954 3548
2955sub emergency_save() { 3549sub emergency_save() {
2956 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
2957 3551
2958 warn "enter emergency perl save\n"; 3552 warn "emergency_perl_save: enter\n";
2959 3553
2960 cf::sync_job { 3554 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559
2961 # use a peculiar iteration method to avoid tripping on perl 3560 # use a peculiar iteration method to avoid tripping on perl
2962 # refcount bugs in for. also avoids problems with players 3561 # refcount bugs in for. also avoids problems with players
2963 # and maps saved/destroyed asynchronously. 3562 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3563 warn "emergency_perl_save: begin player save\n";
2965 for my $login (keys %cf::PLAYER) { 3564 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3565 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3566 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3568 $pl->save;
2969 } 3569 }
2970 warn "end emergency player save\n"; 3570 warn "emergency_perl_save: end player save\n";
2971 3571
2972 warn "begin emergency map save\n"; 3572 warn "emergency_perl_save: begin map save\n";
2973 for my $path (keys %cf::MAP) { 3573 for my $path (keys %cf::MAP) {
2974 my $map = $cf::MAP{$path} or next; 3574 my $map = $cf::MAP{$path} or next;
2975 $map->valid or next; 3575 $map->valid or next;
2976 $map->save; 3576 $map->save;
2977 } 3577 }
2978 warn "end emergency map save\n"; 3578 warn "emergency_perl_save: end map save\n";
2979 3579
2980 warn "begin emergency database checkpoint\n"; 3580 warn "emergency_perl_save: begin database checkpoint\n";
2981 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
2982 warn "end emergency database checkpoint\n"; 3582 warn "emergency_perl_save: end database checkpoint\n";
3583
3584 warn "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n";
2983 }; 3587 };
2984 3588
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
2985 warn "leave emergency perl save\n"; 3594 warn "emergency_perl_save: leave\n";
2986} 3595}
2987 3596
2988sub post_cleanup { 3597sub post_cleanup {
2989 my ($make_core) = @_; 3598 my ($make_core) = @_;
2990 3599
2991 warn Carp::longmess "post_cleanup backtrace" 3600 warn Carp::longmess "post_cleanup backtrace"
2992 if $make_core; 3601 if $make_core;
3602
3603 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$;
3605}
3606
3607# a safer delete_package, copied from Symbol
3608sub clear_package($) {
3609 my $pkg = shift;
3610
3611 # expand to full symbol table name if needed
3612 unless ($pkg =~ /^main::.*::$/) {
3613 $pkg = "main$pkg" if $pkg =~ /^::/;
3614 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3615 $pkg .= '::' unless $pkg =~ /::$/;
3616 }
3617
3618 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3619 my $stem_symtab = *{$stem}{HASH};
3620
3621 defined $stem_symtab and exists $stem_symtab->{$leaf}
3622 or return;
3623
3624 # clear all symbols
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 }
3630 warn "cleared package $pkg\n";#d#
2993} 3631}
2994 3632
2995sub do_reload_perl() { 3633sub do_reload_perl() {
2996 # can/must only be called in main 3634 # can/must only be called in main
2997 if ($Coro::current != $Coro::main) { 3635 if ($Coro::current != $Coro::main) {
2998 warn "can only reload from main coroutine"; 3636 warn "can only reload from main coroutine";
2999 return; 3637 return;
3000 } 3638 }
3001 3639
3640 return if $RELOAD++;
3641
3642 my $t1 = EV::time;
3643
3644 while ($RELOAD) {
3002 warn "reloading..."; 3645 warn "reloading...";
3003 3646
3004 warn "entering sync_job"; 3647 warn "entering sync_job";
3005 3648
3006 cf::sync_job { 3649 cf::sync_job {
3007 cf::write_runtime; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
3008 cf::emergency_save; 3651 cf::emergency_save;
3009 cf::write_runtime; # external watchdog should not bark 3652 cf::write_runtime_sync; # external watchdog should not bark
3010 3653
3011 warn "syncing database to disk"; 3654 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV; 3655 BDB::db_env_txn_checkpoint $DB_ENV;
3013 3656
3014 # if anything goes wrong in here, we should simply crash as we already saved 3657 # if anything goes wrong in here, we should simply crash as we already saved
3015 3658
3016 warn "cancelling all WF_AUTOCANCEL watchers";
3017 for (Event::all_watchers) {
3018 $_->cancel if $_->data & WF_AUTOCANCEL;
3019 }
3020
3021 warn "flushing outstanding aio requests"; 3659 warn "flushing outstanding aio requests";
3022 for (;;) {
3023 BDB::flush;
3024 IO::AIO::flush;
3025 Coro::cede;
3026 last unless IO::AIO::nreqs || BDB::nreqs; 3660 while (IO::AIO::nreqs || BDB::nreqs) {
3027 warn "iterate..."; 3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3028 }
3029
3030 ++$RELOAD;
3031
3032 warn "cancelling all extension coros";
3033 $_->cancel for values %EXT_CORO;
3034 %EXT_CORO = ();
3035
3036 warn "removing commands";
3037 %COMMAND = ();
3038
3039 warn "removing ext/exti commands";
3040 %EXTCMD = ();
3041 %EXTICMD = ();
3042
3043 warn "unloading/nuking all extensions";
3044 for my $pkg (@EXTS) {
3045 warn "... unloading $pkg";
3046
3047 if (my $cb = $pkg->can ("unload")) {
3048 eval {
3049 $cb->($pkg);
3050 1
3051 } or warn "$pkg unloaded, but with errors: $@";
3052 } 3662 }
3053 3663
3054 warn "... nuking $pkg"; 3664 warn "cancelling all extension coros";
3055 Symbol::delete_package $pkg; 3665 $_->cancel for values %EXT_CORO;
3056 } 3666 %EXT_CORO = ();
3057 3667
3058 warn "unloading all perl modules loaded from $LIBDIR"; 3668 warn "removing commands";
3059 while (my ($k, $v) = each %INC) { 3669 %COMMAND = ();
3060 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3061 3670
3671 warn "removing ext/exti commands";
3672 %EXTCMD = ();
3673 %EXTICMD = ();
3674
3675 warn "unloading/nuking all extensions";
3676 for my $pkg (@EXTS) {
3062 warn "... unloading $k"; 3677 warn "... unloading $pkg";
3063 delete $INC{$k};
3064 3678
3065 $k =~ s/\.pm$//;
3066 $k =~ s/\//::/g;
3067
3068 if (my $cb = $k->can ("unload_module")) { 3679 if (my $cb = $pkg->can ("unload")) {
3680 eval {
3069 $cb->(); 3681 $cb->($pkg);
3682 1
3683 } or warn "$pkg unloaded, but with errors: $@";
3684 }
3685
3686 warn "... clearing $pkg";
3687 clear_package $pkg;
3070 } 3688 }
3071 3689
3072 Symbol::delete_package $k; 3690 warn "unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693
3694 warn "... unloading $k";
3695 delete $INC{$k};
3696
3697 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g;
3699
3700 if (my $cb = $k->can ("unload_module")) {
3701 $cb->();
3702 }
3703
3704 clear_package $k;
3073 } 3705 }
3074 3706
3075 warn "getting rid of safe::, as good as possible"; 3707 warn "getting rid of safe::, as good as possible";
3076 Symbol::delete_package "safe::$_" 3708 clear_package "safe::$_"
3077 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3078 3710
3079 warn "unloading cf.pm \"a bit\""; 3711 warn "unloading cf.pm \"a bit\"";
3080 delete $INC{"cf.pm"}; 3712 delete $INC{"cf.pm"};
3081 delete $INC{"cf/pod.pm"}; 3713 delete $INC{"cf/pod.pm"};
3082 3714
3083 # don't, removes xs symbols, too, 3715 # don't, removes xs symbols, too,
3084 # and global variables created in xs 3716 # and global variables created in xs
3085 #Symbol::delete_package __PACKAGE__; 3717 #clear_package __PACKAGE__;
3086 3718
3087 warn "unload completed, starting to reload now"; 3719 warn "unload completed, starting to reload now";
3088 3720
3089 warn "reloading cf.pm"; 3721 warn "reloading cf.pm";
3090 require cf; 3722 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3724
3093 warn "loading config and database again"; 3725 warn "loading config and database again";
3094 cf::cfg_load; 3726 cf::reload_config;
3095 3727
3096 warn "loading extensions"; 3728 warn "loading extensions";
3097 cf::load_extensions; 3729 cf::load_extensions;
3098 3730
3731 if ($REATTACH_ON_RELOAD) {
3099 warn "reattaching attachments to objects/players"; 3732 warn "reattaching attachments to objects/players";
3100 _global_reattach; # objects, sockets 3733 _global_reattach; # objects, sockets
3101 warn "reattaching attachments to maps"; 3734 warn "reattaching attachments to maps";
3102 reattach $_ for values %MAP; 3735 reattach $_ for values %MAP;
3103 warn "reattaching attachments to players"; 3736 warn "reattaching attachments to players";
3104 reattach $_ for values %PLAYER; 3737 reattach $_ for values %PLAYER;
3738 }
3105 3739
3740 warn "running post_init jobs";
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742
3106 warn "leaving sync_job"; 3743 warn "leaving sync_job";
3107 3744
3108 1 3745 1
3109 } or do { 3746 } or do {
3110 warn $@; 3747 warn $@;
3111 warn "error while reloading, exiting."; 3748 cf::cleanup "error while reloading, exiting.";
3112 exit 1;
3113 }; 3749 };
3114 3750
3115 warn "reloaded"; 3751 warn "reloaded";
3752 --$RELOAD;
3753 }
3754
3755 $t1 = EV::time - $t1;
3756 warn "reload completed in ${t1}s\n";
3116}; 3757};
3117 3758
3118our $RELOAD_WATCHER; # used only during reload 3759our $RELOAD_WATCHER; # used only during reload
3119 3760
3120sub reload_perl() { 3761sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 3762 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 3763 # coro crashes during coro_state_free->destroy here.
3123 3764
3124 $RELOAD_WATCHER ||= Event->timer ( 3765 $RELOAD_WATCHER ||= cf::async {
3125 reentrant => 0, 3766 Coro::AIO::aio_wait cache_extensions;
3126 after => 0, 3767
3127 data => WF_AUTOCANCEL, 3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3128 cb => sub {
3129 do_reload_perl; 3769 do_reload_perl;
3130 undef $RELOAD_WATCHER; 3770 undef $RELOAD_WATCHER;
3131 }, 3771 };
3132 ); 3772 };
3133} 3773}
3134 3774
3135register_command "reload" => sub { 3775register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3776 my ($who, $arg) = @_;
3137 3777
3138 if ($who->flag (FLAG_WIZ)) { 3778 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3779 $who->message ("reloading server.");
3780 async {
3781 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3782 reload_perl;
3783 };
3141 } 3784 }
3142}; 3785};
3143 3786
3144unshift @INC, $LIBDIR; 3787unshift @INC, $LIBDIR;
3145 3788
3147 3790
3148our @WAIT_FOR_TICK; 3791our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN; 3792our @WAIT_FOR_TICK_BEGIN;
3150 3793
3151sub wait_for_tick { 3794sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active;
3153 return if $Coro::current == $Coro::main; 3795 return if tick_inhibit || $Coro::current == $Coro::main;
3154 3796
3155 my $signal = new Coro::Signal; 3797 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal; 3798 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait; 3799 $signal->wait;
3158} 3800}
3159 3801
3160sub wait_for_tick_begin { 3802sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active;
3162 return if $Coro::current == $Coro::main; 3803 return if tick_inhibit || $Coro::current == $Coro::main;
3163 3804
3164 my $signal = new Coro::Signal; 3805 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3806 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3807 $signal->wait;
3167} 3808}
3168 3809
3169 my $min = 1e6;#d# 3810sub tick {
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer (
3172 reentrant => 0,
3173 parked => 1,
3174 prio => 0,
3175 at => $NEXT_TICK || $TICK,
3176 data => WF_AUTOCANCEL,
3177 cb => sub {
3178 if ($Coro::current != $Coro::main) { 3811 if ($Coro::current != $Coro::main) {
3179 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3812 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3180 unless ++$bug_warning > 10; 3813 unless ++$bug_warning > 10;
3181 return; 3814 return;
3182 } 3815 }
3183 3816
3184 $NOW = $tick_start = Event::time;
3185
3186 cf::server_tick; # one server iteration 3817 cf::server_tick; # one server iteration
3187 3818
3188 0 && sync_job {#d# 3819 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3189 for(1..10) { 3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3190 my $t = Event::time; 3821 Coro::async_pool {
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3822 $Coro::current->{desc} = "runtime saver";
3192 or die; 3823 write_runtime_sync
3193 3824 or warn "ERROR: unable to write runtime file: $!";
3194 $map->width (50);
3195 $map->height (50);
3196 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1);
3198 my $t = Event::time - $t;
3199
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 }; 3825 };
3826 }
3210 3827
3211 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK;
3213
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool {
3217 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!";
3219 };
3220 }
3221
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3829 $sig->send;
3227 } 3830 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3831 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3832 $sig->send;
3230 } 3833 }
3231 3834
3232 $NOW = Event::time; 3835 $LOAD = ($NOW - $TICK_START) / $TICK;
3233
3234 # if we are delayed by four ticks or more, skip them all
3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237 $TICK_WATCHER->at ($NEXT_TICK);
3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3836 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3837
3243 _post_tick; 3838 if (0) {
3244 3839 if ($NEXT_TICK) {
3245 3840 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d#
3843 }
3246 }, 3844 }
3247); 3845}
3248 3846
3249{ 3847{
3250 BDB::max_poll_time $TICK * 0.1; 3848 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 3849
3252 reentrant => 0,
3253 fd => BDB::poll_fileno,
3254 poll => 'r',
3255 prio => 0,
3256 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb,
3258 );
3259 BDB::min_parallel 8; 3850 BDB::min_parallel 8;
3260 3851 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 3852 $AnyEvent::BDB::WATCHER->priority (1);
3262 my $status;
3263 my $current = $Coro::current;
3264 (
3265 sub {
3266 $status = $!;
3267 $current->ready; undef $current;
3268 },
3269 sub {
3270 Coro::schedule while defined $current;
3271 $! = $status;
3272 },
3273 )
3274 };
3275 3853
3276 unless ($DB_ENV) { 3854 unless ($DB_ENV) {
3277 $DB_ENV = BDB::db_env_create; 3855 $DB_ENV = BDB::db_env_create;
3856 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3857 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3858 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3859 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3860 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278 3861
3279 cf::sync_job { 3862 cf::sync_job {
3280 eval { 3863 eval {
3281 BDB::db_env_open 3864 BDB::db_env_open
3282 $DB_ENV, 3865 $DB_ENV,
3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3867 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3868 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3869 0666;
3287 3870
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3871 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 3872 };
3293 3873
3294 cf::cleanup "db_env_open(db): $@" if $@; 3874 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3875 };
3296 } 3876 }
3877
3878 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3879 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3880 };
3881 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3882 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3883 };
3884 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3885 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3886 };
3297} 3887}
3298 3888
3299{ 3889{
3890 # configure IO::AIO
3891
3300 IO::AIO::min_parallel 8; 3892 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 3893 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 3894 undef $AnyEvent::AIO::WATCHER;
3305 reentrant => 0,
3306 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno,
3308 poll => 'r',
3309 prio => 6,
3310 cb => \&IO::AIO::poll_cb,
3311 );
3312} 3895}
3313 3896
3314my $_log_backtrace; 3897my $_log_backtrace;
3315 3898
3316sub _log_backtrace { 3899sub _log_backtrace {
3319 $msg =~ s/\n//; 3902 $msg =~ s/\n//;
3320 3903
3321 # limit the # of concurrent backtraces 3904 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3905 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3906 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg;
3324 async { 3908 async {
3909 $Coro::current->{desc} = "abt $msg";
3910
3325 my @bt = fork_call { 3911 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3912 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3913 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3914 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!"; 3915 or die "addr2line: $!";
3337 } 3923 }
3338 3924
3339 @funcs 3925 @funcs
3340 }; 3926 };
3341 3927
3342 LOG llevInfo, "[ABT] $msg\n"; 3928 LOG llevInfo, "[ABT] $perl_bt\n";
3929 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3343 LOG llevInfo, "[ABT] $_\n" for @bt; 3930 LOG llevInfo, "[ABT] $_\n" for @bt;
3344 --$_log_backtrace; 3931 --$_log_backtrace;
3345 }; 3932 };
3346 } else { 3933 } else {
3347 LOG llevInfo, "[ABT] $msg\n"; 3934 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines