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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(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 on
82 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 115our $DB_ENV;
116
117our @EXTRA_MODULES = qw(pod mapscript);
85 118
86our %CFG; 119our %CFG;
87 120
88our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 122our $RUNTIME;
123our $NOW;
90 124
91our %PLAYER; # all users 125our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 126our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 127our $LINK_MAP; # the special {link} map, which is always available
94 128
95# used to convert map paths into valid unix filenames by replacing / by ∕ 129# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 131
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
101 140
102binmode STDOUT; 141binmode STDOUT;
103binmode STDERR; 142binmode STDERR;
104 143
105# read virtual server time, if available 144# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
110} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
111 152
112mkdir $_ 153mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 155
115our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
158 199
159The raw value load value from the last tick. 200The raw value load value from the last tick.
160 201
161=item %cf::CFG 202=item %cf::CFG
162 203
163Configuration for the server, loaded from C</etc/crossfire/config>, or 204Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 205from wherever your confdir points to.
165 206
166=item cf::wait_for_tick, cf::wait_for_tick_begin 207=item cf::wait_for_tick, cf::wait_for_tick_begin
167 208
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 227 $msg .= "\n"
187 unless $msg =~ /\n$/; 228 unless $msg =~ /\n$/;
188 229
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 231
191 utf8::encode $msg;
192 LOG llevError, $msg; 232 LOG llevError, $msg;
193 }; 233 };
194} 234}
235
236$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "=="
238
239 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d#
242 }#d#
243
244 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate
247};
248
249$SIG{__DIE__} = sub { }; #d#?
195 250
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 261for my $pkg (qw(
207 cf::global cf::attachable 262 cf::global cf::attachable
208 cf::object cf::object::player 263 cf::object cf::object::player
209 cf::client cf::player 264 cf::client cf::player
210 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
211 cf::map cf::party cf::region 267 cf::party cf::region
212)) { 268)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 270}
216 271
217$Event::DIED = sub { 272$EV::DIED = sub {
218 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
219}; 274};
220 275
221############################################################################# 276#############################################################################
222 277
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 301 $d
247 } || "[unable to dump $_[0]: '$@']"; 302 } || "[unable to dump $_[0]: '$@']";
248} 303}
249 304
250=item $ref = cf::from_json $json 305=item $ref = cf::decode_json $json
251 306
252Converts a JSON string into the corresponding perl data structure. 307Converts a JSON string into the corresponding perl data structure.
253 308
254=item $json = cf::to_json $ref 309=item $json = cf::encode_json $ref
255 310
256Converts a perl data structure into its JSON representation. 311Converts a perl data structure into its JSON representation.
257 312
258=cut 313=cut
259 314
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 316
262sub to_json ($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
264 333
265=item cf::lock_wait $string 334=item cf::lock_wait $string
266 335
267Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
268 337
269=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
270 339
271Wait until the given lock is available and then acquires it and returns 340Wait 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, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
274returned. 343returned.
275 344
345Locks are *not* recursive, locking from the same coro twice results in a
346deadlocked coro.
347
276Lock names should begin with a unique identifier (for example, cf::map::find 348Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 349uses map_find and cf::map::load uses map_load).
278 350
279=item $locked = cf::lock_active $string 351=item $locked = cf::lock_active $string
280 352
281Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
282 354
283=cut 355=cut
284 356
285our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
286 358
287sub lock_wait($) { 359sub lock_wait($) {
288 my ($key) = @_; 360 $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} 361}
296 362
297sub lock_acquire($) { 363sub lock_acquire($) {
298 my ($key) = @_; 364 $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} 365}
310 366
311sub lock_active($) { 367sub lock_active($) {
312 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 369}
316 370
317sub freeze_mainloop { 371sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
319 373
320 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start;
322 };
323 $TICK_WATCHER->stop;
324 $guard
325} 375}
326 376
377=item cf::periodic $interval, $cb
378
379Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer.
381
382=cut
383
384sub periodic($$) {
385 my ($interval, $cb) = @_;
386
387 my $start = rand List::Util::min 180, $interval;
388
389 EV::periodic $start, $interval, 0, $cb
390}
391
327=item cf::get_slot $time[, $priority] 392=item cf::get_slot $time[, $priority[, $name]]
328 393
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 394Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 395This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 396of cpu time till the next tick. The slot is only valid till the next cede.
332 397
398The optional C<$name> can be used to identify the job to run. It might be
399used for statistical purposes and should identify the same time-class.
400
333Useful for short background jobs. 401Useful for short background jobs.
334 402
335=cut 403=cut
336 404
337our @SLOT_QUEUE; 405our @SLOT_QUEUE;
338our $SLOT_QUEUE; 406our $SLOT_QUEUE;
339 407
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 408$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 409$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager");
411
342 my $signal = new Coro::Signal; 412 my $signal = new Coro::Signal;
343 413
344 while () { 414 while () {
345 next_job: 415 next_job:
346 my $avail = cf::till_tick; 416 my $avail = cf::till_tick;
354 } 424 }
355 } 425 }
356 } 426 }
357 427
358 if (@SLOT_QUEUE) { 428 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive 429 # we do not use wait_for_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal; 430 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 431 $signal->wait;
362 } else { 432 } else {
363 Coro::schedule; 433 Coro::schedule;
364 } 434 }
365 } 435 }
366}; 436};
367 437
368sub get_slot($;$) { 438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
369 my ($time, $pri) = @_; 441 my ($time, $pri, $name) = @_;
370 442
443 $time = $TICK * .6 if $time > $TICK * .6;
444 my $sig = new Coro::Signal;
445
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 446 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 448 $SLOT_QUEUE->ready;
374 $sig->wait; 449 $sig->wait;
375} 450}
376 451
384 459
385BEGIN { *async = \&Coro::async_pool } 460BEGIN { *async = \&Coro::async_pool }
386 461
387=item cf::sync_job { BLOCK } 462=item cf::sync_job { BLOCK }
388 463
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 464The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 465is always able to handle events or runnable, as Deliantra is only
391partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 466partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
392acceptable. 467acceptable.
393 468
394If it must be done, put the blocking parts into C<sync_job>. This will run 469If it must be done, put the blocking parts into C<sync_job>. This will run
395the given BLOCK in another coroutine while waiting for the result. The 470the given BLOCK in another coroutine while waiting for the result. The
400 475
401sub sync_job(&) { 476sub sync_job(&) {
402 my ($job) = @_; 477 my ($job) = @_;
403 478
404 if ($Coro::current == $Coro::main) { 479 if ($Coro::current == $Coro::main) {
405 my $time = Event::time; 480 my $time = EV::time;
406 481
407 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
409 484
410 # TODO: use suspend/resume instead 485 LOG llevError, Carp::longmess "sync job";#d#
411 # (but this is cancel-safe) 486
412 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
413 488
414 my $busy = 1; 489 my $busy = 1;
415 my @res; 490 my @res;
416 491
417 (async { 492 (async {
493 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 494 @res = eval { $job->() };
419 warn $@ if $@; 495 warn $@ if $@;
420 undef $busy; 496 undef $busy;
421 })->prio (Coro::PRIO_MAX); 497 })->prio (Coro::PRIO_MAX);
422 498
423 while ($busy) { 499 while ($busy) {
424 Coro::cede or Event::one_event; 500 if (Coro::nready) {
501 Coro::cede_notself;
502 } else {
503 EV::loop EV::LOOP_ONESHOT;
425 } 504 }
505 }
426 506
427 $time = Event::time - $time; 507 my $time = EV::time - $time;
428 508
429 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431
432 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
433 510
434 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
435 } else { 512 } else {
436 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
437 514
462=item fork_call { }, $args 539=item fork_call { }, $args
463 540
464Executes the given code block with the given arguments in a seperate 541Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with 542process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may 543Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 544never block itself or use any form of event handling.
468 545
469=cut 546=cut
470
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479 547
480sub fork_call(&@) { 548sub fork_call(&@) {
481 my ($cb, @args) = @_; 549 my ($cb, @args) = @_;
482 550
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 551 # we seemingly have to make a local copy of the whole thing,
484# or die "socketpair: $!"; 552 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 553 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 554
488 if (my $pid = fork) { 555 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 556 reset_signals;
502 local $SIG{__WARN__}; 557 &$cb
503 local $SIG{__DIE__}; 558 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 559
510 eval { 560 wantarray ? @res : $res[-1]
511 close $fh1; 561}
512 562
513 my @res = eval { $cb->(@args) }; 563=item $coin = coin_from_name $name
514 564
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 565=cut
516 close $fh2;
517 };
518 566
519 warn $@ if $@; 567our %coin_alias = (
520 _exit 0; 568 "silver" => "silvercoin",
521 } 569 "silvercoin" => "silvercoin",
570 "silvercoins" => "silvercoin",
571 "gold" => "goldcoin",
572 "goldcoin" => "goldcoin",
573 "goldcoins" => "goldcoin",
574 "platinum" => "platinacoin",
575 "platinumcoin" => "platinacoin",
576 "platinumcoins" => "platinacoin",
577 "platina" => "platinacoin",
578 "platinacoin" => "platinacoin",
579 "platinacoins" => "platinacoin",
580 "royalty" => "royalty",
581 "royalties" => "royalty",
582);
583
584sub coin_from_name($) {
585 $coin_alias{$_[0]}
586 ? cf::arch::find $coin_alias{$_[0]}
587 : undef
522} 588}
523 589
524=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
525 591
526Returns a single value from the environment database. 592Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 594=item cf::db_put $family => $key => $value
529 595
530Stores the given C<$value> in the family. It can currently store binary 596Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 597data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532 598
599=item $db = cf::db_table "name"
600
601Create and/or open a new database table. The string must not be "db" and must be unique
602within each server.
603
533=cut 604=cut
605
606sub db_table($) {
607 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV;
609
610 eval {
611 $db->set_flags (BDB::CHKSUM);
612
613 utf8::encode $name;
614 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
615 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
616 cf::cleanup "db_open(db): $!" if $!;
617 };
618 cf::cleanup "db_open(db): $@" if $@;
619
620 $db
621}
534 622
535our $DB; 623our $DB;
536 624
537sub db_init { 625sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 626 cf::sync_job {
542 eval { 627 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 628 };
552} 629}
553 630
554sub db_get($$) { 631sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 632 my $key = "$_[0]/$_[1]";
556 633
606 if (1) { 683 if (1) {
607 $md5 = 684 $md5 =
608 join "\x00", 685 join "\x00",
609 $processversion, 686 $processversion,
610 map { 687 map {
611 Coro::cede; 688 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 689 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 690 } 0.. $#$src;
614 691
615 692
616 my $dbmd5 = db_get cache => "$id/md5"; 693 my $dbmd5 = db_get cache => "$id/md5";
654 731
655############################################################################# 732#############################################################################
656 733
657=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
658 735
659Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
660attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
662 739
663In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
664C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
665Crossfire TRT). 742Deliantra).
666 743
667=over 4 744=over 4
668 745
669=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
670 747
714=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
715 792
716Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
717given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
718 795
719Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
720that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
721 798
722These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
723 800
724=over 4 801=over 4
952 } 1029 }
953 1030
954 0 1031 0
955} 1032}
956 1033
957=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
958 1035
959=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
960 1037
961Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
962 1039
968 1045
969=cut 1046=cut
970 1047
971############################################################################# 1048#############################################################################
972# object support 1049# object support
973#
974 1050
1051sub _object_equal($$);
1052sub _object_equal($$) {
1053 my ($a, $b) = @_;
1054
1055 return 0 unless (ref $a) eq (ref $b);
1056
1057 if ("HASH" eq ref $a) {
1058 my @ka = keys %$a;
1059 my @kb = keys %$b;
1060
1061 return 0 if @ka != @kb;
1062
1063 for (0 .. $#ka) {
1064 return 0 unless $ka[$_] eq $kb[$_];
1065 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1066 }
1067
1068 } elsif ("ARRAY" eq ref $a) {
1069
1070 return 0 if @$a != @$b;
1071
1072 for (0 .. $#$a) {
1073 return 0 unless _object_equal $a->[$_], $b->[$_];
1074 }
1075
1076 } elsif ($a ne $b) {
1077 return 0;
1078 }
1079
1080 1
1081}
1082
1083our $SLOW_MERGES;#d#
975sub _can_merge { 1084sub _can_merge {
976 my ($ob1, $ob2) = @_; 1085 my ($ob1, $ob2) = @_;
977 1086
978 local $Storable::canonical = 1; 1087 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1088
982 $fob1 eq $fob2 1089 # we do the slow way here
1090 return _object_equal $ob1, $ob2
983} 1091}
984 1092
985sub reattach { 1093sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1095 my ($obj) = @_;
988 1096
1097 # no longer needed after getting rid of delete_package?
989 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
990 1099
991 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
992 1101
993 @$registry = (); 1102 @$registry = ();
994 1103
1009cf::attachable->attach ( 1118cf::attachable->attach (
1010 prio => -1000000, 1119 prio => -1000000,
1011 on_instantiate => sub { 1120 on_instantiate => sub {
1012 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
1013 1122
1014 $data = from_json $data; 1123 $data = decode_json $data;
1015 1124
1016 for (@$data) { 1125 for (@$data) {
1017 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
1018 1127
1019 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
1035sub object_freezer_save { 1144sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1145 my ($filename, $rdata, $objs) = @_;
1037 1146
1038 sync_job { 1147 sync_job {
1039 if (length $$rdata) { 1148 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1042 1152
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1156 if ($cf::USE_FSYNC) {
1157 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1158 aio_fsync $fh;
1159 }
1047 close $fh; 1160 aio_close $fh;
1048 1161
1049 if (@$objs) { 1162 if (@$objs) {
1050 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1051 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1169 aio_fsync $fh;
1170 }
1055 close $fh; 1171 aio_close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1173 }
1058 } else { 1174 } else {
1059 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
1060 } 1176 }
1061 1177
1062 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1063 } else { 1182 } else {
1064 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1065 } 1184 }
1066 } else { 1185 } else {
1067 aio_unlink $filename; 1186 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1069 } 1188 }
1070 } 1189 };
1071} 1190}
1072 1191
1073sub object_freezer_as_string { 1192sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1193 my ($rdata, $objs) = @_;
1075 1194
1087 or return; 1206 or return;
1088 1207
1089 unless (aio_stat "$filename.pst") { 1208 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1209 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1210 or return;
1211
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1212 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs};
1093 } 1214 }
1094 1215
1216 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1217 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1218 $decname, length $data, scalar @{$av || []};
1219
1097 return ($data, $av); 1220 ($data, $av)
1098} 1221}
1099 1222
1100=head2 COMMAND CALLBACKS 1223=head2 COMMAND CALLBACKS
1101 1224
1102=over 4 1225=over 4
1156 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1157 1280
1158 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1159} 1282}
1160 1283
1284use File::Glob ();
1285
1161cf::player->attach ( 1286cf::player->attach (
1162 on_command => sub { 1287 on_command => sub {
1163 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1164 1289
1165 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
1175 my ($pl, $buf) = @_; 1300 my ($pl, $buf) = @_;
1176 1301
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1302 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1303
1179 if (ref $msg) { 1304 if (ref $msg) {
1305 my ($type, $reply, @payload) =
1306 "ARRAY" eq ref $msg
1307 ? @$msg
1308 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1309
1310 my @reply;
1311
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1312 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1313 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1314 }
1315
1316 $pl->ext_reply ($reply, @reply)
1317 if $reply;
1318
1185 } else { 1319 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1321 }
1188 1322
1189 cf::override; 1323 cf::override;
1190 }, 1324 },
1191); 1325);
1326
1327# "readahead" all extensions
1328sub cache_extensions {
1329 my $grp = IO::AIO::aio_group;
1330
1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1332 for (grep /\.ext$/, @{$_[0]}) {
1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1334 }
1335 };
1336
1337 $grp
1338}
1192 1339
1193sub load_extensions { 1340sub load_extensions {
1194 cf::sync_job { 1341 cf::sync_job {
1195 my %todo; 1342 my %todo;
1196 1343
1216 1363
1217 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1218 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1219 1366
1220 $ext{source} = 1367 $ext{source} =
1221 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1222 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
1223 . $source 1370 . $source
1224 . "\n};\n1"; 1371 . "\n};\n1";
1225 1372
1226 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
1242 my $msg = $@ ? "$v->{path}: $@\n" 1389 my $msg = $@ ? "$v->{path}: $@\n"
1243 : "$v->{base}: extension inactive.\n"; 1390 : "$v->{base}: extension inactive.\n";
1244 1391
1245 if (exists $v->{meta}{mandatory}) { 1392 if (exists $v->{meta}{mandatory}) {
1246 warn $msg; 1393 warn $msg;
1247 warn "mandatory extension failed to load, exiting.\n"; 1394 cf::cleanup "mandatory extension failed to load, exiting.";
1248 exit 1;
1249 } 1395 }
1250 1396
1251 warn $msg; 1397 warn $msg;
1252 } 1398 }
1253 1399
1267 1413
1268=back 1414=back
1269 1415
1270=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1271 1417
1272Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1273 1419
1274=cut 1420=cut
1275 1421
1276package cf::player; 1422package cf::player;
1277 1423
1278use Coro::AIO; 1424use Coro::AIO;
1279 1425
1280=head3 cf::player 1426=head3 cf::player
1281 1427
1282=over 4 1428=over 4
1429
1430=item cf::player::num_playing
1431
1432Returns the official number of playing players, as per the Crossfire metaserver rules.
1433
1434=cut
1435
1436sub num_playing {
1437 scalar grep
1438 $_->ob->map
1439 && !$_->hidden
1440 && !$_->ob->flag (cf::FLAG_WIZ),
1441 cf::player::list
1442}
1283 1443
1284=item cf::player::find $login 1444=item cf::player::find $login
1285 1445
1286Returns the given player object, loading it if necessary (might block). 1446Returns the given player object, loading it if necessary (might block).
1287 1447
1306 1466
1307sub exists($) { 1467sub exists($) {
1308 my ($login) = @_; 1468 my ($login) = @_;
1309 1469
1310 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1311 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1312} 1472}
1313 1473
1314sub find($) { 1474sub find($) {
1315 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1316 my $login = $_[0]; 1476 my $login = $_[0];
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1483 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1484 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1485 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1486 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1487
1328 my $pl = load_pl path $login 1488 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1489 or return;
1490
1491 my $pl = cf::player::load_pl $f
1492 or return;
1493
1494 local $cf::PLAYER_LOADING{$login} = $pl;
1495 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1331 } 1497 }
1332 } 1498 }
1333} 1499}
1334 1500
1343 return if $pl->{deny_save}; 1509 return if $pl->{deny_save};
1344 1510
1345 aio_mkdir playerdir $pl, 0770; 1511 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1512 $pl->{last_save} = $cf::RUNTIME;
1347 1513
1514 cf::get_slot 0.01;
1515
1348 $pl->save_pl ($path); 1516 $pl->save_pl ($path);
1349 Coro::cede; 1517 cf::cede_to_tick;
1350} 1518}
1351 1519
1352sub new($) { 1520sub new($) {
1353 my ($login) = @_; 1521 my ($login) = @_;
1354 1522
1360 $cf::PLAYER{$login} = $self; 1528 $cf::PLAYER{$login} = $self;
1361 1529
1362 $self 1530 $self
1363} 1531}
1364 1532
1533=item $player->send_msg ($channel, $msg, $color, [extra...])
1534
1535=cut
1536
1537sub send_msg {
1538 my $ns = shift->ns
1539 or return;
1540 $ns->send_msg (@_);
1541}
1542
1365=item $pl->quit_character 1543=item $pl->quit_character
1366 1544
1367Nukes the player without looking back. If logged in, the connection will 1545Nukes the player without looking back. If logged in, the connection will
1368be destroyed. May block for a long time. 1546be destroyed. May block for a long time.
1369 1547
1373 my ($pl) = @_; 1551 my ($pl) = @_;
1374 1552
1375 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1376 1554
1377 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1378 $pl->password ("*"); # this should lock out the player until we nuked the dir 1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1379 1557
1380 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1381 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1382 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1383 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1384 1564
1385 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1386 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
1422 or return []; 1602 or return [];
1423 1603
1424 my @logins; 1604 my @logins;
1425 1605
1426 for my $login (@$dirs) { 1606 for my $login (@$dirs) {
1607 my $path = path $login;
1608
1609 # a .pst is a dead give-away for a valid player
1610 # if no pst file found, open and chekc for blocked users
1611 if (aio_stat "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1615 }
1430 1616
1431 utf8::decode $login; 1617 utf8::decode $login;
1432 push @logins, $login; 1618 push @logins, $login;
1433 } 1619 }
1434 1620
1461 } 1647 }
1462 1648
1463 \@paths 1649 \@paths
1464} 1650}
1465 1651
1466=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1467 1653
1468Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1469 1655
1470=cut
1471
1472sub expand_cfpod {
1473 ((my $self), (local $_)) = @_;
1474
1475 # escape & and <
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478
1479 # this is buggy, it needs to properly take care of nested <'s
1480
1481 1 while
1482 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/
1486 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1
1489 }ge
1490 # replace H<hint text>
1491 || s{H<([^\>]*)>}
1492 {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "")
1496 [$self->{hintmode}]
1497 }ge;
1498
1499 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g;
1501
1502 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines
1507
1508 $_
1509}
1510
1511sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode}
1514}
1515
1516=item $player->ext_reply ($msgid, %msg) 1656=item $player->ext_reply ($msgid, @msg)
1517 1657
1518Sends an ext reply to the player. 1658Sends an ext reply to the player.
1519 1659
1520=cut 1660=cut
1521 1661
1522sub ext_reply($$%) { 1662sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1663 my ($self, $id, @msg) = @_;
1524 1664
1525 $msg{msgid} = $id; 1665 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1666}
1528 1667
1529=item $player->ext_event ($type, %msg) 1668=item $player->ext_msg ($type, @msg)
1530 1669
1531Sends an ext event to the client. 1670Sends an ext event to the client.
1532 1671
1533=cut 1672=cut
1534 1673
1535sub ext_event($$%) { 1674sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1675 my ($self, $type, @msg) = @_;
1537 1676
1538 $self->ns->ext_event ($type, %msg); 1677 $self->ns->ext_msg ($type, @msg);
1539} 1678}
1540 1679
1541=head3 cf::region 1680=head3 cf::region
1542 1681
1543=over 4 1682=over 4
1587our $MAX_RESET = 3600; 1726our $MAX_RESET = 3600;
1588our $DEFAULT_RESET = 3000; 1727our $DEFAULT_RESET = 3000;
1589 1728
1590sub generate_random_map { 1729sub generate_random_map {
1591 my ($self, $rmp) = @_; 1730 my ($self, $rmp) = @_;
1731
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733
1592 # mit "rum" bekleckern, nicht 1734 # mit "rum" bekleckern, nicht
1593 $self->_create_random_map ( 1735 $self->_create_random_map (
1594 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1595 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1596 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 1860
1719# the temporary/swap location 1861# the temporary/swap location
1720sub save_path { 1862sub save_path {
1721 my ($self) = @_; 1863 my ($self) = @_;
1722 1864
1723 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1724 "$TMPDIR/$path.map" 1866 "$TMPDIR/$path.map"
1725} 1867}
1726 1868
1727# the unique path, undef == no special unique path 1869# the unique path, undef == no special unique path
1728sub uniq_path { 1870sub uniq_path {
1729 my ($self) = @_; 1871 my ($self) = @_;
1730 1872
1731 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1732 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1733}
1734
1735# and all this just because we cannot iterate over
1736# all maps in C++...
1737sub change_all_map_light {
1738 my ($change) = @_;
1739
1740 $_->change_map_light ($change)
1741 for grep $_->outdoor, values %cf::MAP;
1742} 1875}
1743 1876
1744sub decay_objects { 1877sub decay_objects {
1745 my ($self) = @_; 1878 my ($self) = @_;
1746 1879
1759 1892
1760sub load_header_from($) { 1893sub load_header_from($) {
1761 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1762 1895
1763 utf8::encode $path; 1896 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1898 or return;
1899
1900 $self->_load_header ($f)
1901 or return;
1902
1903 local $MAP_LOADING{$self->{path}} = $self;
1904 $f->resolve_delayed_derefs;
1769 1905
1770 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1771 1907
1772 1 1908 1
1773} 1909}
1827sub find { 1963sub find {
1828 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1829 1965
1830 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1831 1967
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1833 1970
1834 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path";
1836 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1837 or return; 1973 or return;
1838 1974
1839 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1840 1976
1842 or return; 1978 or return;
1843 1979
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
1984 undef $guard1;
1847 $map->reset; 1985 $map->reset;
1848 undef $guard;
1849 return find $path; 1986 return find $path;
1850 } 1987 }
1851 1988
1852 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
1853 } 1990 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 1999 local $self->{deny_reset} = 1; # loading can take a long time
1863 2000
1864 my $path = $self->{path}; 2001 my $path = $self->{path};
1865 2002
1866 { 2003 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2004 my $guard = cf::lock_acquire "map_data:$path";
1868 2005
2006 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2007 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2008
1871 $self->in_memory (cf::MAP_LOADING); 2009 $self->in_memory (cf::MAP_LOADING);
1872 2010
1873 $self->alloc; 2011 $self->alloc;
1874 2012
1875 $self->pre_load; 2013 $self->pre_load;
1876 Coro::cede; 2014 cf::cede_to_tick;
1877 2015
2016 my $f = new_from_file cf::object::thawer $self->{load_path};
2017 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2018 $self->_load_objects ($f)
1879 or return; 2019 or return;
1880 2020
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
1882 if delete $self->{load_original}; 2022 if delete $self->{load_original};
1883 2023
1884 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2025 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2026 unless (aio_stat $uniq) {
2027 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2028 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2029 $self->_load_objects ($f);
2030 $f->resolve_delayed_derefs;
2031 }
1889 } 2032 }
1890 } 2033 }
1891 2034
1892 Coro::cede; 2035 $f->resolve_delayed_derefs;
2036
2037 cf::cede_to_tick;
1893 # now do the right thing for maps 2038 # now do the right thing for maps
1894 $self->link_multipart_objects; 2039 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2040 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2041 unless $self->difficulty;
1897 Coro::cede; 2042 cf::cede_to_tick;
1898 2043
1899 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2045 $self->decay_objects;
1901 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
1902 $self->update_buttons; 2047 $self->update_buttons;
1903 Coro::cede; 2048 cf::cede_to_tick;
1904 $self->set_darkness_map;
1905 Coro::cede;
1906 $self->activate; 2049 $self->activate;
1907 } 2050 }
1908 2051
2052 $self->{last_save} = $cf::RUNTIME;
2053 $self->last_access ($cf::RUNTIME);
2054
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2055 $self->in_memory (cf::MAP_ACTIVE);
1910 } 2056 }
1911 2057
1912 $self->post_load; 2058 $self->post_load;
1913} 2059}
1914 2060
1923 2069
1924 $self 2070 $self
1925} 2071}
1926 2072
1927# find and load all maps in the 3x3 area around a map 2073# find and load all maps in the 3x3 area around a map
1928sub load_diag { 2074sub load_neighbours {
1929 my ($map) = @_; 2075 my ($map) = @_;
1930 2076
1931 my @diag; # diagonal neighbours 2077 my @neigh; # diagonal neighbours
1932 2078
1933 for (0 .. 3) { 2079 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2080 my $neigh = $map->tile_path ($_)
1935 or next; 2081 or next;
1936 $neigh = find $neigh, $map 2082 $neigh = find $neigh, $map
1937 or next; 2083 or next;
1938 $neigh->load; 2084 $neigh->load;
1939 2085
2086 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2087 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2088 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2089 }
1943 2090
1944 for (@diag) { 2091 for (grep defined $_->[0], @neigh) {
2092 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2093 my $neigh = find $path, $origin
1946 or next; 2094 or next;
1947 $neigh->load; 2095 $neigh->load;
1948 } 2096 }
1949} 2097}
1950 2098
1955} 2103}
1956 2104
1957sub do_load_sync { 2105sub do_load_sync {
1958 my ($map) = @_; 2106 my ($map) = @_;
1959 2107
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main;
2110
1960 cf::sync_job { $map->load }; 2111 cf::sync_job { $map->load };
1961} 2112}
1962 2113
1963our %MAP_PREFETCH; 2114our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2115our $MAP_PREFETCHER = undef;
1965 2116
1966sub find_async { 2117sub find_async {
1967 my ($path, $origin) = @_; 2118 my ($path, $origin, $load) = @_;
1968 2119
1969 $path = normalise $path, $origin && $origin->{path}; 2120 $path = normalise $path, $origin && $origin->{path};
1970 2121
1971 if (my $map = $cf::MAP{$path}) { 2122 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2124 }
1974 2125
1975 undef $MAP_PREFETCH{$path}; 2126 $MAP_PREFETCH{$path} |= $load;
2127
1976 $MAP_PREFETCHER ||= cf::async { 2128 $MAP_PREFETCHER ||= cf::async {
2129 $Coro::current->{desc} = "map prefetcher";
2130
1977 while (%MAP_PREFETCH) { 2131 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2132 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2133 if (my $map = find $k) {
1980 $map->load; 2134 $map->load if $v;
1981 } 2135 }
1982 2136
1983 delete $MAP_PREFETCH{$path}; 2137 delete $MAP_PREFETCH{$k};
1984 } 2138 }
1985 } 2139 }
1986 undef $MAP_PREFETCHER; 2140 undef $MAP_PREFETCHER;
1987 }; 2141 };
1988 $MAP_PREFETCHER->prio (6); 2142 $MAP_PREFETCHER->prio (6);
1991} 2145}
1992 2146
1993sub save { 2147sub save {
1994 my ($self) = @_; 2148 my ($self) = @_;
1995 2149
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2151
1998 $self->{last_save} = $cf::RUNTIME; 2152 $self->{last_save} = $cf::RUNTIME;
1999 2153
2000 return unless $self->dirty; 2154 return unless $self->dirty;
2001 2155
2007 return if $self->{deny_save}; 2161 return if $self->{deny_save};
2008 2162
2009 local $self->{last_access} = $self->last_access;#d# 2163 local $self->{last_access} = $self->last_access;#d#
2010 2164
2011 cf::async { 2165 cf::async {
2166 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2167 $_->contr->save for $self->players;
2013 }; 2168 };
2169
2170 cf::get_slot 0.02;
2014 2171
2015 if ($uniq) { 2172 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2173 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2174 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2175 } else {
2024 my ($self) = @_; 2181 my ($self) = @_;
2025 2182
2026 # save first because save cedes 2183 # save first because save cedes
2027 $self->save; 2184 $self->save;
2028 2185
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2186 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2187
2031 return if $self->players; 2188 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2189 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2190 return if $self->{deny_save};
2034 2191
2192 $self->in_memory (cf::MAP_SWAPPED);
2193
2194 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2196 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2197}
2038 2198
2039sub reset_at { 2199sub reset_at {
2040 my ($self) = @_; 2200 my ($self) = @_;
2041 2201
2073 if $uniq; 2233 if $uniq;
2074 } 2234 }
2075 2235
2076 delete $cf::MAP{$self->path}; 2236 delete $cf::MAP{$self->path};
2077 2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2240 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2241
2082 $self->unlink_save; 2242 $self->unlink_save;
2083 $self->destroy; 2243 $self->destroy;
2084} 2244}
2085 2245
2086my $nuke_counter = "aaaa"; 2246my $nuke_counter = "aaaa";
2087 2247
2088sub nuke { 2248sub nuke {
2089 my ($self) = @_; 2249 my ($self) = @_;
2090 2250
2251 {
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2091 delete $cf::MAP{$self->path}; 2254 delete $cf::MAP{$self->path};
2092 2255
2093 $self->unlink_save; 2256 $self->unlink_save;
2094 2257
2095 bless $self, "cf::map"; 2258 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2259 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2260 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2261 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2263
2101 $cf::MAP{$self->path} = $self; 2264 $cf::MAP{$self->path} = $self;
2265 }
2102 2266
2103 $self->reset; # polite request, might not happen 2267 $self->reset; # polite request, might not happen
2104} 2268}
2105 2269
2106=item $maps = cf::map::tmp_maps 2270=item $maps = cf::map::tmp_maps
2148 2312
2149sub unique_maps() { 2313sub unique_maps() {
2150 [ 2314 [
2151 map { 2315 map {
2152 utf8::decode $_; 2316 utf8::decode $_;
2153 /\.map$/ 2317 s/\.map$//; # TODO future compatibility hack
2318 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2319 ? ()
2154 ? normalise $_ 2320 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2321 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2322 ]
2158} 2323}
2159 2324
2160package cf;
2161
2162=back 2325=back
2163 2326
2164=head3 cf::object 2327=head3 cf::object
2165 2328
2166=cut 2329=cut
2169 2332
2170=over 4 2333=over 4
2171 2334
2172=item $ob->inv_recursive 2335=item $ob->inv_recursive
2173 2336
2174Returns the inventory of the object _and_ their inventories, recursively. 2337Returns the inventory of the object I<and> their inventories, recursively,
2338but I<not> the object itself.
2175 2339
2176=cut 2340=cut
2177 2341
2178sub inv_recursive_; 2342sub inv_recursive_;
2179sub inv_recursive_ { 2343sub inv_recursive_ {
2182 2346
2183sub inv_recursive { 2347sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2348 inv_recursive_ inv $_[0]
2185} 2349}
2186 2350
2351=item $ref = $ob->ref
2352
2353Creates and returns a persistent reference to an object that can be stored as a string.
2354
2355=item $ob = cf::object::deref ($refstring)
2356
2357returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2358even if the object actually exists. May block.
2359
2360=cut
2361
2362sub deref {
2363 my ($ref) = @_;
2364
2365 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2366 my ($uuid, $name) = ($1, $2);
2367 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2368 or return;
2369 $pl->ob->uuid eq $uuid
2370 or return;
2371
2372 $pl->ob
2373 } else {
2374 warn "$ref: cannot resolve object reference\n";
2375 undef
2376 }
2377}
2378
2187package cf; 2379package cf;
2188 2380
2189=back 2381=back
2190 2382
2191=head3 cf::object::player 2383=head3 cf::object::player
2197Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2389Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2198can be C<undef>. Does the right thing when the player is currently in a 2390can be C<undef>. Does the right thing when the player is currently in a
2199dialogue with the given NPC character. 2391dialogue with the given NPC character.
2200 2392
2201=cut 2393=cut
2394
2395our $SAY_CHANNEL = {
2396 id => "say",
2397 title => "Map",
2398 reply => "say ",
2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2400};
2401
2402our $CHAT_CHANNEL = {
2403 id => "chat",
2404 title => "Chat",
2405 reply => "chat ",
2406 tooltip => "Player chat and shouts, global to the server.",
2407};
2202 2408
2203# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2410# with dialog boxes.
2205#TODO: the first argument must go, split into a $npc->reply_to ( method 2411#TODO: the first argument must go, split into a $npc->reply_to ( method
2206sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
2213 2419
2214 } else { 2420 } else {
2215 my $pl = $self->contr; 2421 my $pl = $self->contr;
2216 2422
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2423 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2424 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2425 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2426
2226 } else { 2427 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2430 }
2230 } 2431 }
2432}
2433
2434=item $object->send_msg ($channel, $msg, $color, [extra...])
2435
2436=cut
2437
2438sub cf::object::send_msg {
2439 my $pl = shift->contr
2440 or return;
2441 $pl->send_msg (@_);
2231} 2442}
2232 2443
2233=item $player_object->may ("access") 2444=item $player_object->may ("access")
2234 2445
2235Returns wether the given player is authorized to access resource "access" 2446Returns wether the given player is authorized to access resource "access"
2248 2459
2249=item $player_object->enter_link 2460=item $player_object->enter_link
2250 2461
2251Freezes the player and moves him/her to a special map (C<{link}>). 2462Freezes the player and moves him/her to a special map (C<{link}>).
2252 2463
2253The player should be reasonably safe there for short amounts of time. You 2464The player should be reasonably safe there for short amounts of time (e.g.
2254I<MUST> call C<leave_link> as soon as possible, though. 2465for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link
2467map.
2255 2468
2256Will never block. 2469Will never block.
2257 2470
2258=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2259 2472
2314 # use -1 or undef as default coordinates, not 0, 0 2527 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2528 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2529 if $x <=0 && $y <= 0;
2317 2530
2318 $map->load; 2531 $map->load;
2319 $map->load_diag; 2532 $map->load_neighbours;
2320 2533
2321 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2322 $self->activate_recursive; 2536 $self->activate_recursive;
2323 2537
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2325 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2326} 2540}
2331her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2332that has to return the map if sucecssful, and then unfreezes the player on 2546that has to return the map if sucecssful, and then unfreezes the player on
2333the new (success) or old (failed) map position. In either case, $done will 2547the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process. 2548be called at the end of this process.
2335 2549
2550Note that $check will be called with a potentially non-loaded map, so if
2551it needs a loaded map it has to call C<< ->load >>.
2552
2336=cut 2553=cut
2337 2554
2338our $GOTOGEN; 2555our $GOTOGEN;
2339 2556
2340sub cf::object::player::goto { 2557sub cf::object::player::goto {
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2562
2346 $self->enter_link; 2563 $self->enter_link;
2347 2564
2348 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2349 my $map = eval { 2587 my $map = eval {
2350 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2351 2589
2352 if ($map) { 2590 if ($map) {
2353 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2355 } else { 2593 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2595 }
2358 2596
2359 $map 2597 $map
2360 }; 2598 };
2361 2599
2397} 2635}
2398 2636
2399sub prepare_random_map { 2637sub prepare_random_map {
2400 my ($exit) = @_; 2638 my ($exit) = @_;
2401 2639
2402 my $guard = cf::lock_acquire "exit_prepare:$exit";
2403
2404 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2405 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2406 # that depends on the exit object 2642 # that depends on the exit object
2407 2643
2408 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
2410 if ($exit->map) { 2646 if ($exit->map) {
2411 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2412 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2413 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2414 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2415 } 2653 }
2416 2654
2417 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2418 2656
2419 my $data = cf::to_json $rmp; 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2422 2660
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2425 undef $fh; 2663 undef $fh;
2426 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2427 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2428 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2429 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2430 } 2672 }
2431} 2673}
2432 2674
2433sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2434 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2435 2677
2436 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2437 2679
2438 if ($exit->slaying eq "/!") {
2439 #TODO: this should de-fi-ni-te-ly not be a sync-job
2440 # the problem is that $exit might not survive long enough
2441 # so it needs to be done right now, right here
2442 cf::sync_job { prepare_random_map $exit };
2443 }
2444
2445 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2446 my $hp = $exit->stats->hp;
2447 my $sp = $exit->stats->sp;
2448
2449 $self->enter_link; 2680 $self->enter_link;
2450 2681
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2455 (async { 2682 (async {
2456 $self->deactivate_recursive; # just to be sure 2683 $Coro::current->{desc} = "enter_exit";
2684
2457 unless (eval { 2685 unless (eval {
2686 $self->deactivate_recursive; # just to be sure
2687
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2697 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp;
2699
2458 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2459 2701
2702 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y)
2704 if $exit->flag (cf::FLAG_DAMNED);
2705
2460 1; 2706 1
2461 }) { 2707 }) {
2462 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2463 . "I'll try to bring you back to the map you were before. " 2709 . "I'll try to bring you back to the map you were before. "
2464 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2465 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2466 2712
2467 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2741the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2742the message unless the client supports the msg packet.
2497 2743
2498=cut 2744=cut
2499 2745
2746# non-persistent channels (usually the info channel)
2747our %CHANNEL = (
2748 "c/identify" => {
2749 id => "infobox",
2750 title => "Identify",
2751 reply => undef,
2752 tooltip => "Items recently identified",
2753 },
2754 "c/examine" => {
2755 id => "infobox",
2756 title => "Examine",
2757 reply => undef,
2758 tooltip => "Signs and other items you examined",
2759 },
2760 "c/book" => {
2761 id => "infobox",
2762 title => "Book",
2763 reply => undef,
2764 tooltip => "The contents of a note or book",
2765 },
2766 "c/lookat" => {
2767 id => "infobox",
2768 title => "Look",
2769 reply => undef,
2770 tooltip => "What you saw there",
2771 },
2772 "c/who" => {
2773 id => "infobox",
2774 title => "Players",
2775 reply => undef,
2776 tooltip => "Shows players who are currently online",
2777 },
2778 "c/body" => {
2779 id => "infobox",
2780 title => "Body Parts",
2781 reply => undef,
2782 tooltip => "Shows which body parts you posess and are available",
2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2790 "c/skills" => {
2791 id => "infobox",
2792 title => "Skills",
2793 reply => undef,
2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2819 },
2820 "c/uptime" => {
2821 id => "infobox",
2822 title => "Uptime",
2823 reply => undef,
2824 tooltip => "How long the server has been running since last restart",
2825 },
2826 "c/mapinfo" => {
2827 id => "infobox",
2828 title => "Map Info",
2829 reply => undef,
2830 tooltip => "Information related to the maps",
2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2846);
2847
2500sub cf::client::send_msg { 2848sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2850
2503 $msg = $self->pl->expand_cfpod ($msg); 2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2504 2853
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2855
2856 # check predefined channels, for the benefit of C
2857 if ($CHANNEL{$channel}) {
2858 $channel = $CHANNEL{$channel};
2859
2860 $self->ext_msg (channel_info => $channel);
2861 $channel = $channel->{id};
2862
2507 if (ref $channel) { 2863 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2867 $self->ext_msg (channel_info => $channel);
2512 } 2868 }
2513 2869
2514 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2515 } 2871 }
2516 2872
2517 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2518 2874
2519 if ($self->can_msg) { 2875 # default colour, mask it out
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2521 } else { 2877 if $color & cf::NDI_DEF;
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531 2878
2532 if ($color >= 0) { 2879 my $pkt = "msg "
2533 if (0 && $msg =~ /\[/) { 2880 . $self->{json_coder}->encode (
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2535 } else { 2882 );
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg")
2538 }
2539 }
2540 }
2541}
2542 2883
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt);
2895}
2896
2543=item $client->ext_event ($type, %msg) 2897=item $client->ext_msg ($type, @msg)
2544 2898
2545Sends an ext event to the client. 2899Sends an ext event to the client.
2546 2900
2547=cut 2901=cut
2548 2902
2549sub cf::client::ext_event($$%) { 2903sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2904 my ($self, $type, @msg) = @_;
2551 2905
2552 return unless $self->extcmd; 2906 if ($self->extcmd == 2) {
2553 2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2909 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2556} 2930}
2557 2931
2558=item $success = $client->query ($flags, "text", \&cb) 2932=item $success = $client->query ($flags, "text", \&cb)
2559 2933
2560Queues a query to the client, calling the given callback with 2934Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2989 my ($ns, $buf) = @_;
2616 2990
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2991 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2992
2619 if (ref $msg) { 2993 if (ref $msg) {
2994 my ($type, $reply, @payload) =
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998
2999 my @reply;
3000
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3001 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 3002 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 3003 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
2626 } else { 3008 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 3010 }
2629 3011
2630 cf::override; 3012 cf::override;
2677our $safe = new Safe "safe"; 3059our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3060our $safe_hole = new Safe::Hole;
2679 3061
2680$SIG{FPE} = 'IGNORE'; 3062$SIG{FPE} = 'IGNORE';
2681 3063
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3064$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math
3066 grepstart grepwhile mapstart mapwhile
3067 sort time
3068));
2683 3069
2684# here we export the classes and methods available to script code 3070# here we export the classes and methods available to script code
2685 3071
2686=pod 3072=pod
2687 3073
2688The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2689 3075
2690 cf::object 3076 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3077 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3078 insert remove name archname title slaying race decrease split
3079 value
2693 3080
2694 cf::object::player 3081 cf::object::player
2695 player 3082 player
2696 3083
2697 cf::player 3084 cf::player
2702 3089
2703=cut 3090=cut
2704 3091
2705for ( 3092for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3093 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)], 3094 insert remove inv nrof name archname title slaying race
3095 decrease split destroy change_exp value msg lore send_msg)],
2708 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
2710 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
2711) { 3099) {
2712 no strict 'refs'; 3100 no strict 'refs';
2713 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
2714 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2731 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
2732 3120
2733 my $qcode = $code; 3121 my $qcode = $code;
2734 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2735 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
2736 3126
2737 local $_; 3127 local $_;
2738 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
2739 3129
2740 my $eval = 3130 my $eval =
2788# the server's init and main functions 3178# the server's init and main functions
2789 3179
2790sub load_facedata($) { 3180sub load_facedata($) {
2791 my ($path) = @_; 3181 my ($path) = @_;
2792 3182
3183 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = ();
3186
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188
2793 warn "loading facedata from $path\n"; 3189 warn "loading facedata from $path\n";
2794 3190
2795 my $facedata; 3191 my $facedata;
2796 0 < aio_load $path, $facedata 3192 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3193 or die "$path: $!";
2799 $facedata = Coro::Storable::thaw $facedata; 3195 $facedata = Coro::Storable::thaw $facedata;
2800 3196
2801 $facedata->{version} == 2 3197 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3198 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 3199
3200 # patch in the exptable
3201 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3204 };
3205 cf::cede_to_tick;
3206
2804 { 3207 {
2805 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
2806 3209
2807 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
2809 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3217
2814 cf::cede_to_tick; 3218 cf::cede_to_tick;
2815 } 3219 }
2816 3220
2817 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
2819 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
2820 or next; 3225 or next;
3226
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3230 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
2842 3248
2843 { 3249 {
2844 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3253
2849 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3255 if (defined $info->{type}) {
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
2857 3258
2858 if ($name =~ /\.jpg$/) { 3259 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3260 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
2861 } else { 3274 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3275 $RESOURCE{$name} = $info;
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3276 }
2868 3277
2869 cf::cede_to_tick; 3278 cf::cede_to_tick;
2870 } 3279 }
2871 } 3280 }
2872 3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283
2873 1 3284 1
2874} 3285}
2875 3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306
3307register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_;
3309
3310 while (my ($k, $v) = each %$want) {
3311 $ns->fx_want ($k, $v);
3312 }
3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3324
2876sub reload_regions { 3325sub reload_regions {
3326 # HACK to clear player env face cache, we need some signal framework
3327 # for this (global event?)
3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3329
2877 load_resource_file "$MAPDIR/regions" 3330 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3331 or die "unable to load regions file\n";
2879 3332
2880 for (cf::region::list) { 3333 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3334 $_->{match} = qr/$_->{match}/
2889} 3342}
2890 3343
2891sub reload_archetypes { 3344sub reload_archetypes {
2892 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
2893 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
2894 #d# NEED to laod twice to resolve forward references
2895 # this really needs to be done in an extra post-pass
2896 # (which needs to be synchronous, so solve it differently)
2897 load_resource_file "$DATADIR/archetypes"
2898 or die "unable to load archetypes\n";
2899} 3347}
2900 3348
2901sub reload_treasures { 3349sub reload_treasures {
2902 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
2903 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
2904} 3352}
2905 3353
2906sub reload_resources { 3354sub reload_resources {
2907 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
2908 3356
3357 reload_facedata;
3358 reload_archetypes;
2909 reload_regions; 3359 reload_regions;
2910 reload_facedata;
2911 #reload_archetypes;#d#
2912 reload_archetypes;
2913 reload_treasures; 3360 reload_treasures;
2914 3361
2915 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
2916} 3363}
2917 3364
2918sub init { 3365sub reload_config {
2919 reload_resources;
2920}
2921
2922sub cfg_load {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3367 or return;
2925 3368
2926 local $/; 3369 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
2928 3371
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2930 3373
2931 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2932 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2938 }; 3381 };
2939 warn $@ if $@; 3382 warn $@ if $@;
2940 } 3383 }
2941} 3384}
2942 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
2943sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419
2944 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3423 (async {
2948 Event::one_event; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3425 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
2950 }; 3427 };
2951 3428
2952 cfg_load; 3429 evthread_start IO::AIO::poll_fileno;
3430
3431 cf::sync_job {
3432 reload_resources;
3433 reload_config;
2953 db_init; 3434 db_init;
3435
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid;
3439 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills;
3442
3443 cf::init_beforeplay;
3444
3445 atomic;
3446
2954 load_extensions; 3447 load_extensions;
2955 3448
2956 $TICK_WATCHER->start; 3449 utime time, time, $RUNTIMEFILE;
3450
3451 # no (long-running) fork's whatsoever before this point(!)
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453
3454 (pop @POST_INIT)->(0) while @POST_INIT;
3455 };
3456
2957 Event::loop; 3457 EV::loop;
2958} 3458}
2959 3459
2960############################################################################# 3460#############################################################################
2961# initialisation and cleanup 3461# initialisation and cleanup
2962 3462
2963# install some emergency cleanup handlers 3463# install some emergency cleanup handlers
2964BEGIN { 3464BEGIN {
3465 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3466 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3467 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2967 reentrant => 0,
2968 data => WF_AUTOCANCEL,
2969 signal => $signal,
2970 prio => 0,
2971 cb => sub {
2972 cf::cleanup "SIG$signal"; 3468 cf::cleanup "SIG$signal";
2973 },
2974 ); 3469 };
2975 } 3470 }
2976} 3471}
2977 3472
2978sub write_runtime { 3473sub write_runtime_sync {
2979 my $runtime = "$LOCALDIR/runtime";
2980
2981 # first touch the runtime file to show we are still running: 3474 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time. 3475 # the fsync below can take a very very long time.
2983 3476
2984 IO::AIO::aio_utime $runtime, undef, undef; 3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2985 3478
2986 my $guard = cf::lock_acquire "write_runtime"; 3479 my $guard = cf::lock_acquire "write_runtime";
2987 3480
2988 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2989 or return; 3482 or return;
2990 3483
2991 my $value = $cf::RUNTIME + 90 + 10; 3484 my $value = $cf::RUNTIME + 90 + 10;
2992 # 10 is the runtime save interval, for a monotonic clock 3485 # 10 is the runtime save interval, for a monotonic clock
2993 # 60 allows for the watchdog to kill the server. 3486 # 60 allows for the watchdog to kill the server.
3003 aio_utime $fh, undef, undef; 3496 aio_utime $fh, undef, undef;
3004 3497
3005 close $fh 3498 close $fh
3006 or return; 3499 or return;
3007 3500
3008 aio_rename "$runtime~", $runtime 3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3009 and return; 3502 and return;
3010 3503
3011 warn "runtime file written.\n"; 3504 warn "runtime file written.\n";
3012 3505
3013 1 3506 1
3507}
3508
3509our $uuid_lock;
3510our $uuid_skip;
3511
3512sub write_uuid_sync($) {
3513 $uuid_skip ||= $_[0];
3514
3515 return if $uuid_lock;
3516 local $uuid_lock = 1;
3517
3518 my $uuid = "$LOCALDIR/uuid";
3519
3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3521 or return;
3522
3523 my $value = uuid_seq uuid_cur;
3524
3525 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n";
3527 return;
3528 }
3529
3530 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0;
3532
3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3534 and return;
3535
3536 # always fsync - this file is important
3537 aio_fsync $fh
3538 and return;
3539
3540 close $fh
3541 or return;
3542
3543 aio_rename "$uuid~", $uuid
3544 and return;
3545
3546 warn "uuid file written ($value).\n";
3547
3548 1
3549
3550}
3551
3552sub write_uuid($$) {
3553 my ($skip, $sync) = @_;
3554
3555 $sync ? write_uuid_sync $skip
3556 : async { write_uuid_sync $skip };
3014} 3557}
3015 3558
3016sub emergency_save() { 3559sub emergency_save() {
3017 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
3018 3561
3019 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
3020 3563
3021 cf::sync_job { 3564 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569
3022 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
3023 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
3024 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
3026 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3576 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3578 $pl->save;
3030 } 3579 }
3031 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
3032 3581
3033 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
3034 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
3035 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
3036 $map->valid or next; 3585 $map->valid or next;
3037 $map->save; 3586 $map->save;
3038 } 3587 }
3039 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
3040 3589
3041 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
3042 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
3043 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3593
3594 warn "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n";
3044 }; 3597 };
3045 3598
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3046 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
3047} 3605}
3048 3606
3049sub post_cleanup { 3607sub post_cleanup {
3050 my ($make_core) = @_; 3608 my ($make_core) = @_;
3051 3609
3052 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
3053 if $make_core; 3611 if $make_core;
3612
3613 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$;
3615}
3616
3617# a safer delete_package, copied from Symbol
3618sub clear_package($) {
3619 my $pkg = shift;
3620
3621 # expand to full symbol table name if needed
3622 unless ($pkg =~ /^main::.*::$/) {
3623 $pkg = "main$pkg" if $pkg =~ /^::/;
3624 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3625 $pkg .= '::' unless $pkg =~ /::$/;
3626 }
3627
3628 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3629 my $stem_symtab = *{$stem}{HASH};
3630
3631 defined $stem_symtab and exists $stem_symtab->{$leaf}
3632 or return;
3633
3634 # clear all symbols
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 }
3640 warn "cleared package $pkg\n";#d#
3054} 3641}
3055 3642
3056sub do_reload_perl() { 3643sub do_reload_perl() {
3057 # can/must only be called in main 3644 # can/must only be called in main
3058 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
3059 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
3060 return; 3647 return;
3061 } 3648 }
3062 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
3063 warn "reloading..."; 3655 warn "reloading...";
3064 3656
3065 warn "entering sync_job"; 3657 warn "entering sync_job";
3066 3658
3067 cf::sync_job { 3659 cf::sync_job {
3068 cf::write_runtime; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
3069 cf::emergency_save; 3661 cf::emergency_save;
3070 cf::write_runtime; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
3071 3663
3072 warn "syncing database to disk"; 3664 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
3074 3666
3075 # if anything goes wrong in here, we should simply crash as we already saved 3667 # if anything goes wrong in here, we should simply crash as we already saved
3076 3668
3077 warn "cancelling all WF_AUTOCANCEL watchers";
3078 for (Event::all_watchers) {
3079 $_->cancel if $_->data & WF_AUTOCANCEL;
3080 }
3081
3082 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
3083 for (;;) {
3084 BDB::flush;
3085 IO::AIO::flush;
3086 Coro::cede;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
3088 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3089 }
3090
3091 ++$RELOAD;
3092
3093 warn "cancelling all extension coros";
3094 $_->cancel for values %EXT_CORO;
3095 %EXT_CORO = ();
3096
3097 warn "removing commands";
3098 %COMMAND = ();
3099
3100 warn "removing ext/exti commands";
3101 %EXTCMD = ();
3102 %EXTICMD = ();
3103
3104 warn "unloading/nuking all extensions";
3105 for my $pkg (@EXTS) {
3106 warn "... unloading $pkg";
3107
3108 if (my $cb = $pkg->can ("unload")) {
3109 eval {
3110 $cb->($pkg);
3111 1
3112 } or warn "$pkg unloaded, but with errors: $@";
3113 } 3672 }
3114 3673
3115 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
3116 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
3117 } 3676 %EXT_CORO = ();
3118 3677
3119 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
3120 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
3121 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3122 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
3123 warn "... unloading $k"; 3687 warn "... unloading $pkg";
3124 delete $INC{$k};
3125 3688
3126 $k =~ s/\.pm$//;
3127 $k =~ s/\//::/g;
3128
3129 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
3130 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
3131 } 3698 }
3132 3699
3133 Symbol::delete_package $k; 3700 warn "unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703
3704 warn "... unloading $k";
3705 delete $INC{$k};
3706
3707 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g;
3709
3710 if (my $cb = $k->can ("unload_module")) {
3711 $cb->();
3712 }
3713
3714 clear_package $k;
3134 } 3715 }
3135 3716
3136 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
3137 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
3138 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3139 3720
3140 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3141 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3142 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3143 3724
3144 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3145 # and global variables created in xs 3726 # and global variables created in xs
3146 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3147 3728
3148 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
3149 3730
3150 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
3151 require cf; 3732 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3734
3154 warn "loading config and database again"; 3735 warn "loading config and database again";
3155 cf::cfg_load; 3736 cf::reload_config;
3156 3737
3157 warn "loading extensions"; 3738 warn "loading extensions";
3158 cf::load_extensions; 3739 cf::load_extensions;
3159 3740
3741 if ($REATTACH_ON_RELOAD) {
3160 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3161 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3162 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3163 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3164 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3165 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3166 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
3167 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3168 3754
3169 1 3755 1
3170 } or do { 3756 } or do {
3171 warn $@; 3757 warn $@;
3172 warn "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
3173 exit 1;
3174 }; 3759 };
3175 3760
3176 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3177}; 3767};
3178 3768
3179our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3180 3770
3181sub reload_perl() { 3771sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3184 3774
3185 $RELOAD_WATCHER ||= Event->timer ( 3775 $RELOAD_WATCHER ||= cf::async {
3186 reentrant => 0, 3776 Coro::AIO::aio_wait cache_extensions;
3187 after => 0, 3777
3188 data => WF_AUTOCANCEL, 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3189 cb => sub {
3190 do_reload_perl; 3779 do_reload_perl;
3191 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3192 }, 3781 };
3193 ); 3782 };
3194} 3783}
3195 3784
3196register_command "reload" => sub { 3785register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
3198 3787
3199 if ($who->flag (FLAG_WIZ)) { 3788 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3789 $who->message ("reloading server.");
3790 async {
3791 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3792 reload_perl;
3793 };
3202 } 3794 }
3203}; 3795};
3204 3796
3205unshift @INC, $LIBDIR; 3797unshift @INC, $LIBDIR;
3206 3798
3208 3800
3209our @WAIT_FOR_TICK; 3801our @WAIT_FOR_TICK;
3210our @WAIT_FOR_TICK_BEGIN; 3802our @WAIT_FOR_TICK_BEGIN;
3211 3803
3212sub wait_for_tick { 3804sub wait_for_tick {
3213 return unless $TICK_WATCHER->is_active;
3214 return if $Coro::current == $Coro::main; 3805 return if tick_inhibit || $Coro::current == $Coro::main;
3215 3806
3216 my $signal = new Coro::Signal; 3807 my $signal = new Coro::Signal;
3217 push @WAIT_FOR_TICK, $signal; 3808 push @WAIT_FOR_TICK, $signal;
3218 $signal->wait; 3809 $signal->wait;
3219} 3810}
3220 3811
3221sub wait_for_tick_begin { 3812sub wait_for_tick_begin {
3222 return unless $TICK_WATCHER->is_active;
3223 return if $Coro::current == $Coro::main; 3813 return if tick_inhibit || $Coro::current == $Coro::main;
3224 3814
3225 my $signal = new Coro::Signal; 3815 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3816 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3817 $signal->wait;
3228} 3818}
3229 3819
3230 my $min = 1e6;#d# 3820sub tick {
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer (
3233 reentrant => 0,
3234 parked => 1,
3235 prio => 0,
3236 at => $NEXT_TICK || $TICK,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 if ($Coro::current != $Coro::main) { 3821 if ($Coro::current != $Coro::main) {
3240 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3241 unless ++$bug_warning > 10; 3823 unless ++$bug_warning > 10;
3242 return; 3824 return;
3243 } 3825 }
3244 3826
3245 $NOW = $tick_start = Event::time;
3246
3247 cf::server_tick; # one server iteration 3827 cf::server_tick; # one server iteration
3248 3828
3249 0 && sync_job {#d# 3829 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3250 for(1..10) { 3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3251 my $t = Event::time; 3831 Coro::async_pool {
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3832 $Coro::current->{desc} = "runtime saver";
3253 or die; 3833 write_runtime_sync
3254 3834 or warn "ERROR: unable to write runtime file: $!";
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 }; 3835 };
3836 }
3271 3837
3272 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK;
3274
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool {
3278 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!";
3280 };
3281 }
3282
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3839 $sig->send;
3288 } 3840 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3841 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3842 $sig->send;
3291 } 3843 }
3292 3844
3293 $NOW = Event::time; 3845 $LOAD = ($NOW - $TICK_START) / $TICK;
3294
3295 # if we are delayed by four ticks or more, skip them all
3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298 $TICK_WATCHER->at ($NEXT_TICK);
3299 $TICK_WATCHER->start;
3300
3301 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3847
3304 _post_tick; 3848 if (0) {
3305 3849 if ($NEXT_TICK) {
3306 3850 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d#
3853 }
3307 }, 3854 }
3308); 3855}
3309 3856
3310{ 3857{
3311 BDB::max_poll_time $TICK * 0.1; 3858 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 3859
3313 reentrant => 0,
3314 fd => BDB::poll_fileno,
3315 poll => 'r',
3316 prio => 0,
3317 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb,
3319 );
3320 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3321 3861 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 3862 $AnyEvent::BDB::WATCHER->priority (1);
3323 my $status;
3324 my $current = $Coro::current;
3325 (
3326 sub {
3327 $status = $!;
3328 $current->ready; undef $current;
3329 },
3330 sub {
3331 Coro::schedule while defined $current;
3332 $! = $status;
3333 },
3334 )
3335 };
3336 3863
3337 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3865 $DB_ENV = BDB::db_env_create;
3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3867 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3868 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3869 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3870 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3871
3340 cf::sync_job { 3872 cf::sync_job {
3341 eval { 3873 eval {
3342 BDB::db_env_open 3874 BDB::db_env_open
3343 $DB_ENV, 3875 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3877 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3878 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3879 0666;
3348 3880
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3881 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3882 };
3354 3883
3355 cf::cleanup "db_env_open(db): $@" if $@; 3884 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3885 };
3357 } 3886 }
3887
3888 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3889 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3890 };
3891 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3892 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3893 };
3894 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3895 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3896 };
3358} 3897}
3359 3898
3360{ 3899{
3900 # configure IO::AIO
3901
3361 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 3904 undef $AnyEvent::AIO::WATCHER;
3366 reentrant => 0,
3367 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno,
3369 poll => 'r',
3370 prio => 6,
3371 cb => \&IO::AIO::poll_cb,
3372 );
3373} 3905}
3374 3906
3375my $_log_backtrace; 3907my $_log_backtrace;
3376 3908
3377sub _log_backtrace { 3909sub _log_backtrace {
3380 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3381 3913
3382 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3385 async { 3918 async {
3919 $Coro::current->{desc} = "abt $msg";
3920
3386 my @bt = fork_call { 3921 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3923 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3924 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3925 or die "addr2line: $!";
3398 } 3933 }
3399 3934
3400 @funcs 3935 @funcs
3401 }; 3936 };
3402 3937
3403 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3404 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3405 --$_log_backtrace; 3941 --$_log_backtrace;
3406 }; 3942 };
3407 } else { 3943 } else {
3408 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3409 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3410 } 3946 }
3411} 3947}
3412 3948
3413# load additional modules 3949# load additional modules
3414use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3415 3951
3416END { cf::emergency_save } 3952END { cf::emergency_save }
3417 3953
34181 39541
3419 3955

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines