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.310 by elmex, Mon Jul 16 15:43:49 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; 375}
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
392=item cf::get_slot $time[, $priority[, $name]]
393
394Allocate $time seconds of blocking CPU time at priority C<$priority>:
395This call blocks and returns only when you have at least C<$time> seconds
396of cpu time till the next tick. The slot is only valid till the next cede.
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
401Useful for short background jobs.
402
403=cut
404
405our @SLOT_QUEUE;
406our $SLOT_QUEUE;
407
408$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager");
411
412 my $signal = new Coro::Signal;
413
414 while () {
415 next_job:
416 my $avail = cf::till_tick;
417 if ($avail > 0.01) {
418 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) {
420 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send;
422 Coro::cede;
423 goto next_job;
424 }
425 }
426 }
427
428 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait;
432 } else {
433 Coro::schedule;
434 }
322 }; 435 }
323 $TICK_WATCHER->stop; 436};
324 $guard 437
438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
441 my ($time, $pri, $name) = @_;
442
443 $time = $TICK * .6 if $time > $TICK * .6;
444 my $sig = new Coro::Signal;
445
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready;
449 $sig->wait;
325} 450}
326 451
327=item cf::async { BLOCK } 452=item cf::async { BLOCK }
328 453
329Currently the same as Coro::async_pool, meaning you cannot use 454Currently the same as Coro::async_pool, meaning you cannot use
334 459
335BEGIN { *async = \&Coro::async_pool } 460BEGIN { *async = \&Coro::async_pool }
336 461
337=item cf::sync_job { BLOCK } 462=item cf::sync_job { BLOCK }
338 463
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 464The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 465is always able to handle events or runnable, as Deliantra is only
341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 466partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable. 467acceptable.
343 468
344If 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
345the given BLOCK in another coroutine while waiting for the result. The 470the given BLOCK in another coroutine while waiting for the result. The
350 475
351sub sync_job(&) { 476sub sync_job(&) {
352 my ($job) = @_; 477 my ($job) = @_;
353 478
354 if ($Coro::current == $Coro::main) { 479 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 480 my $time = EV::time;
356 481
357 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
359 484
360 # TODO: use suspend/resume instead 485 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 486
362 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
363 488
364 my $busy = 1; 489 my $busy = 1;
365 my @res; 490 my @res;
366 491
367 (async { 492 (async {
493 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 494 @res = eval { $job->() };
369 warn $@ if $@; 495 warn $@ if $@;
370 undef $busy; 496 undef $busy;
371 })->prio (Coro::PRIO_MAX); 497 })->prio (Coro::PRIO_MAX);
372 498
373 while ($busy) { 499 while ($busy) {
374 Coro::cede or Event::one_event; 500 if (Coro::nready) {
501 Coro::cede_notself;
502 } else {
503 EV::loop EV::LOOP_ONESHOT;
375 } 504 }
505 }
376 506
377 $time = Event::time - $time; 507 my $time = EV::time - $time;
378 508
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
383 510
384 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
385 } else { 512 } else {
386 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
387 514
412=item fork_call { }, $args 539=item fork_call { }, $args
413 540
414Executes the given code block with the given arguments in a seperate 541Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 542process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 543Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 544never block itself or use any form of event handling.
418 545
419=cut 546=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 547
430sub fork_call(&@) { 548sub fork_call(&@) {
431 my ($cb, @args) = @_; 549 my ($cb, @args) = @_;
432 550
433# 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,
434# or die "socketpair: $!"; 552 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 553 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 554
438 if (my $pid = fork) { 555 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 556 reset_signals;
452 local $SIG{__WARN__}; 557 &$cb
453 local $SIG{__DIE__}; 558 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 559
460 eval { 560 wantarray ? @res : $res[-1]
461 close $fh1; 561}
462 562
463 my @res = eval { $cb->(@args) }; 563=item $coin = coin_from_name $name
464 564
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 565=cut
466 close $fh2;
467 };
468 566
469 warn $@ if $@; 567our %coin_alias = (
470 _exit 0; 568 "silver" => "silvercoin",
471 } 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
472} 588}
473 589
474=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
475 591
476Returns a single value from the environment database. 592Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 594=item cf::db_put $family => $key => $value
479 595
480Stores 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
481data 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).
482 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
483=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}
484 622
485our $DB; 623our $DB;
486 624
487sub db_init { 625sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 626 cf::sync_job {
492 eval { 627 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 628 };
502} 629}
503 630
504sub db_get($$) { 631sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 632 my $key = "$_[0]/$_[1]";
506 633
556 if (1) { 683 if (1) {
557 $md5 = 684 $md5 =
558 join "\x00", 685 join "\x00",
559 $processversion, 686 $processversion,
560 map { 687 map {
561 Coro::cede; 688 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 689 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 690 } 0.. $#$src;
564 691
565 692
566 my $dbmd5 = db_get cache => "$id/md5"; 693 my $dbmd5 = db_get cache => "$id/md5";
604 731
605############################################################################# 732#############################################################################
606 733
607=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
608 735
609Many 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
610attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
612 739
613In 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>
614C<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
615Crossfire TRT). 742Deliantra).
616 743
617=over 4 744=over 4
618 745
619=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
620 747
664=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
665 792
666Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
667given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
668 795
669Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
670that 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.
671 798
672These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
673 800
674=over 4 801=over 4
902 } 1029 }
903 1030
904 0 1031 0
905} 1032}
906 1033
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1035
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1037
911Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
912 1039
919=cut 1046=cut
920 1047
921############################################################################# 1048#############################################################################
922# object support 1049# object support
923 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#
1084sub _can_merge {
1085 my ($ob1, $ob2) = @_;
1086
1087 ++$SLOW_MERGES;#d#
1088
1089 # we do the slow way here
1090 return _object_equal $ob1, $ob2
1091}
1092
924sub reattach { 1093sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1095 my ($obj) = @_;
927 1096
1097 # no longer needed after getting rid of delete_package?
928 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
929 1099
930 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
931 1101
932 @$registry = (); 1102 @$registry = ();
933 1103
948cf::attachable->attach ( 1118cf::attachable->attach (
949 prio => -1000000, 1119 prio => -1000000,
950 on_instantiate => sub { 1120 on_instantiate => sub {
951 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
952 1122
953 $data = from_json $data; 1123 $data = decode_json $data;
954 1124
955 for (@$data) { 1125 for (@$data) {
956 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
957 1127
958 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1144sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1145 my ($filename, $rdata, $objs) = @_;
976 1146
977 sync_job { 1147 sync_job {
978 if (length $$rdata) { 1148 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
981 1152
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 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 }
986 close $fh; 1160 aio_close $fh;
987 1161
988 if (@$objs) { 1162 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
993 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 }
994 close $fh; 1171 aio_close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
996 } 1173 }
997 } else { 1174 } else {
998 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
999 } 1176 }
1000 1177
1001 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1002 } else { 1182 } else {
1003 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1004 } 1184 }
1005 } else { 1185 } else {
1006 aio_unlink $filename; 1186 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1008 } 1188 }
1009 } 1189 };
1010} 1190}
1011 1191
1012sub object_freezer_as_string { 1192sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1193 my ($rdata, $objs) = @_;
1014 1194
1026 or return; 1206 or return;
1027 1207
1028 unless (aio_stat "$filename.pst") { 1208 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1209 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1210 or return;
1211
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1212 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs};
1032 } 1214 }
1033 1215
1216 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1217 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1218 $decname, length $data, scalar @{$av || []};
1219
1036 return ($data, $av); 1220 ($data, $av)
1037} 1221}
1038 1222
1039=head2 COMMAND CALLBACKS 1223=head2 COMMAND CALLBACKS
1040 1224
1041=over 4 1225=over 4
1095 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1096 1280
1097 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1098} 1282}
1099 1283
1284use File::Glob ();
1285
1100cf::player->attach ( 1286cf::player->attach (
1101 on_command => sub { 1287 on_command => sub {
1102 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1103 1289
1104 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
1114 my ($pl, $buf) = @_; 1300 my ($pl, $buf) = @_;
1115 1301
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1302 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1303
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1312 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1313 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1314 }
1315
1316 $pl->ext_reply ($reply, @reply)
1317 if $reply;
1318
1124 } else { 1319 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1321 }
1127 1322
1128 cf::override; 1323 cf::override;
1129 }, 1324 },
1130); 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}
1131 1339
1132sub load_extensions { 1340sub load_extensions {
1133 cf::sync_job { 1341 cf::sync_job {
1134 my %todo; 1342 my %todo;
1135 1343
1155 1363
1156 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1157 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1158 1366
1159 $ext{source} = 1367 $ext{source} =
1160 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1161 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
1162 . $source 1370 . $source
1163 . "\n};\n1"; 1371 . "\n};\n1";
1164 1372
1165 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
1181 my $msg = $@ ? "$v->{path}: $@\n" 1389 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1390 : "$v->{base}: extension inactive.\n";
1183 1391
1184 if (exists $v->{meta}{mandatory}) { 1392 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1393 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1394 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1395 }
1189 1396
1190 warn $msg; 1397 warn $msg;
1191 } 1398 }
1192 1399
1206 1413
1207=back 1414=back
1208 1415
1209=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1210 1417
1211Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1212 1419
1213=cut 1420=cut
1214 1421
1215package cf::player; 1422package cf::player;
1216 1423
1217use Coro::AIO; 1424use Coro::AIO;
1218 1425
1219=head3 cf::player 1426=head3 cf::player
1220 1427
1221=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}
1222 1443
1223=item cf::player::find $login 1444=item cf::player::find $login
1224 1445
1225Returns the given player object, loading it if necessary (might block). 1446Returns the given player object, loading it if necessary (might block).
1226 1447
1245 1466
1246sub exists($) { 1467sub exists($) {
1247 my ($login) = @_; 1468 my ($login) = @_;
1248 1469
1249 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1250 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1251} 1472}
1252 1473
1253sub find($) { 1474sub find($) {
1254 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1255 my $login = $_[0]; 1476 my $login = $_[0];
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1483 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1484 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1485 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1486 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1487
1267 my $pl = load_pl path $login 1488 my $f = new_from_file cf::object::thawer path $login
1268 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;
1269 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1270 } 1497 }
1271 } 1498 }
1272} 1499}
1273 1500
1282 return if $pl->{deny_save}; 1509 return if $pl->{deny_save};
1283 1510
1284 aio_mkdir playerdir $pl, 0770; 1511 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1512 $pl->{last_save} = $cf::RUNTIME;
1286 1513
1514 cf::get_slot 0.01;
1515
1287 $pl->save_pl ($path); 1516 $pl->save_pl ($path);
1288 Coro::cede; 1517 cf::cede_to_tick;
1289} 1518}
1290 1519
1291sub new($) { 1520sub new($) {
1292 my ($login) = @_; 1521 my ($login) = @_;
1293 1522
1299 $cf::PLAYER{$login} = $self; 1528 $cf::PLAYER{$login} = $self;
1300 1529
1301 $self 1530 $self
1302} 1531}
1303 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
1304=item $pl->quit_character 1543=item $pl->quit_character
1305 1544
1306Nukes the player without looking back. If logged in, the connection will 1545Nukes the player without looking back. If logged in, the connection will
1307be destroyed. May block for a long time. 1546be destroyed. May block for a long time.
1308 1547
1312 my ($pl) = @_; 1551 my ($pl) = @_;
1313 1552
1314 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1315 1554
1316 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1317 $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
1318 1557
1319 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1320 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1321 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1322 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1323 1564
1324 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1325 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
1361 or return []; 1602 or return [];
1362 1603
1363 my @logins; 1604 my @logins;
1364 1605
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1615 }
1369 1616
1370 utf8::decode $login; 1617 utf8::decode $login;
1371 push @logins, $login; 1618 push @logins, $login;
1372 } 1619 }
1373 1620
1400 } 1647 }
1401 1648
1402 \@paths 1649 \@paths
1403} 1650}
1404 1651
1405=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1406 1653
1407Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1408 1655
1409=cut
1410
1411sub expand_cfpod {
1412 ((my $self), (local $_)) = @_;
1413
1414 # escape & and <
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417
1418 # this is buggy, it needs to properly take care of nested <'s
1419
1420 1 while
1421 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/
1425 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1
1428 }ge
1429 # replace H<hint text>
1430 || s{H<([^\>]*)>}
1431 {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "")
1435 [$self->{hintmode}]
1436 }ge;
1437
1438 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g;
1440
1441 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1446
1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1453}
1454
1455=item $player->ext_reply ($msgid, %msg) 1656=item $player->ext_reply ($msgid, @msg)
1456 1657
1457Sends an ext reply to the player. 1658Sends an ext reply to the player.
1458 1659
1459=cut 1660=cut
1460 1661
1461sub ext_reply($$%) { 1662sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1663 my ($self, $id, @msg) = @_;
1463 1664
1464 $msg{msgid} = $id; 1665 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1666}
1467 1667
1468=item $player->ext_event ($type, %msg) 1668=item $player->ext_msg ($type, @msg)
1469 1669
1470Sends an ext event to the client. 1670Sends an ext event to the client.
1471 1671
1472=cut 1672=cut
1473 1673
1474sub ext_event($$%) { 1674sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1675 my ($self, $type, @msg) = @_;
1476 1676
1477 $self->ns->ext_event ($type, %msg); 1677 $self->ns->ext_msg ($type, @msg);
1478} 1678}
1479 1679
1480=head3 cf::region 1680=head3 cf::region
1481 1681
1482=over 4 1682=over 4
1526our $MAX_RESET = 3600; 1726our $MAX_RESET = 3600;
1527our $DEFAULT_RESET = 3000; 1727our $DEFAULT_RESET = 3000;
1528 1728
1529sub generate_random_map { 1729sub generate_random_map {
1530 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
1531 # mit "rum" bekleckern, nicht 1734 # mit "rum" bekleckern, nicht
1532 $self->_create_random_map ( 1735 $self->_create_random_map (
1533 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1534 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1535 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1657 1860
1658# the temporary/swap location 1861# the temporary/swap location
1659sub save_path { 1862sub save_path {
1660 my ($self) = @_; 1863 my ($self) = @_;
1661 1864
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1866 "$TMPDIR/$path.map"
1664} 1867}
1665 1868
1666# the unique path, undef == no special unique path 1869# the unique path, undef == no special unique path
1667sub uniq_path { 1870sub uniq_path {
1668 my ($self) = @_; 1871 my ($self) = @_;
1669 1872
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1672}
1673
1674# and all this just because we cannot iterate over
1675# all maps in C++...
1676sub change_all_map_light {
1677 my ($change) = @_;
1678
1679 $_->change_map_light ($change)
1680 for grep $_->outdoor, values %cf::MAP;
1681} 1875}
1682 1876
1683sub decay_objects { 1877sub decay_objects {
1684 my ($self) = @_; 1878 my ($self) = @_;
1685 1879
1698 1892
1699sub load_header_from($) { 1893sub load_header_from($) {
1700 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1701 1895
1702 utf8::encode $path; 1896 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 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;
1708 1905
1709 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1710 1907
1711 1 1908 1
1712} 1909}
1766sub find { 1963sub find {
1767 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1768 1965
1769 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1770 1967
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1772 1970
1773 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path";
1775 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1776 or return; 1973 or return;
1777 1974
1778 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1779 1976
1781 or return; 1978 or return;
1782 1979
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
1984 undef $guard1;
1786 $map->reset; 1985 $map->reset;
1787 undef $guard;
1788 return find $path; 1986 return find $path;
1789 } 1987 }
1790 1988
1791 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
1792 } 1990 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 1999 local $self->{deny_reset} = 1; # loading can take a long time
1802 2000
1803 my $path = $self->{path}; 2001 my $path = $self->{path};
1804 2002
1805 { 2003 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2004 my $guard = cf::lock_acquire "map_data:$path";
1807 2005
2006 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2007 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2008
1810 $self->in_memory (cf::MAP_LOADING); 2009 $self->in_memory (cf::MAP_LOADING);
1811 2010
1812 $self->alloc; 2011 $self->alloc;
1813 2012
1814 $self->pre_load; 2013 $self->pre_load;
1815 Coro::cede; 2014 cf::cede_to_tick;
1816 2015
2016 my $f = new_from_file cf::object::thawer $self->{load_path};
2017 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2018 $self->_load_objects ($f)
1818 or return; 2019 or return;
1819 2020
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
1821 if delete $self->{load_original}; 2022 if delete $self->{load_original};
1822 2023
1823 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2025 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2026 unless (aio_stat $uniq) {
2027 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2028 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2029 $self->_load_objects ($f);
2030 $f->resolve_delayed_derefs;
2031 }
1828 } 2032 }
1829 } 2033 }
1830 2034
1831 Coro::cede; 2035 $f->resolve_delayed_derefs;
2036
2037 cf::cede_to_tick;
1832 # now do the right thing for maps 2038 # now do the right thing for maps
1833 $self->link_multipart_objects; 2039 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2040 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2041 unless $self->difficulty;
1836 Coro::cede; 2042 cf::cede_to_tick;
1837 2043
1838 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2045 $self->decay_objects;
1840 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
1841 $self->update_buttons; 2047 $self->update_buttons;
1842 Coro::cede; 2048 cf::cede_to_tick;
1843 $self->set_darkness_map;
1844 Coro::cede;
1845 $self->activate; 2049 $self->activate;
1846 } 2050 }
1847 2051
2052 $self->{last_save} = $cf::RUNTIME;
2053 $self->last_access ($cf::RUNTIME);
2054
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2055 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2056 }
1850 2057
1851 $self->post_load; 2058 $self->post_load;
1852} 2059}
1853 2060
1862 2069
1863 $self 2070 $self
1864} 2071}
1865 2072
1866# 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
1867sub load_diag { 2074sub load_neighbours {
1868 my ($map) = @_; 2075 my ($map) = @_;
1869 2076
1870 my @diag; # diagonal neighbours 2077 my @neigh; # diagonal neighbours
1871 2078
1872 for (0 .. 3) { 2079 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2080 my $neigh = $map->tile_path ($_)
1874 or next; 2081 or next;
1875 $neigh = find $neigh, $map 2082 $neigh = find $neigh, $map
1876 or next; 2083 or next;
1877 $neigh->load; 2084 $neigh->load;
1878 2085
2086 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2087 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2088 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2089 }
1882 2090
1883 for (@diag) { 2091 for (grep defined $_->[0], @neigh) {
2092 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2093 my $neigh = find $path, $origin
1885 or next; 2094 or next;
1886 $neigh->load; 2095 $neigh->load;
1887 } 2096 }
1888} 2097}
1889 2098
1894} 2103}
1895 2104
1896sub do_load_sync { 2105sub do_load_sync {
1897 my ($map) = @_; 2106 my ($map) = @_;
1898 2107
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main;
2110
1899 cf::sync_job { $map->load }; 2111 cf::sync_job { $map->load };
1900} 2112}
1901 2113
1902our %MAP_PREFETCH; 2114our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2115our $MAP_PREFETCHER = undef;
1904 2116
1905sub find_async { 2117sub find_async {
1906 my ($path, $origin) = @_; 2118 my ($path, $origin, $load) = @_;
1907 2119
1908 $path = normalise $path, $origin && $origin->{path}; 2120 $path = normalise $path, $origin && $origin->{path};
1909 2121
1910 if (my $map = $cf::MAP{$path}) { 2122 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2124 }
1913 2125
1914 undef $MAP_PREFETCH{$path}; 2126 $MAP_PREFETCH{$path} |= $load;
2127
1915 $MAP_PREFETCHER ||= cf::async { 2128 $MAP_PREFETCHER ||= cf::async {
2129 $Coro::current->{desc} = "map prefetcher";
2130
1916 while (%MAP_PREFETCH) { 2131 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2132 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2133 if (my $map = find $k) {
1919 $map->load; 2134 $map->load if $v;
1920 } 2135 }
1921 2136
1922 delete $MAP_PREFETCH{$path}; 2137 delete $MAP_PREFETCH{$k};
1923 } 2138 }
1924 } 2139 }
1925 undef $MAP_PREFETCHER; 2140 undef $MAP_PREFETCHER;
1926 }; 2141 };
1927 $MAP_PREFETCHER->prio (6); 2142 $MAP_PREFETCHER->prio (6);
1930} 2145}
1931 2146
1932sub save { 2147sub save {
1933 my ($self) = @_; 2148 my ($self) = @_;
1934 2149
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2151
1937 $self->{last_save} = $cf::RUNTIME; 2152 $self->{last_save} = $cf::RUNTIME;
1938 2153
1939 return unless $self->dirty; 2154 return unless $self->dirty;
1940 2155
1946 return if $self->{deny_save}; 2161 return if $self->{deny_save};
1947 2162
1948 local $self->{last_access} = $self->last_access;#d# 2163 local $self->{last_access} = $self->last_access;#d#
1949 2164
1950 cf::async { 2165 cf::async {
2166 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2167 $_->contr->save for $self->players;
1952 }; 2168 };
2169
2170 cf::get_slot 0.02;
1953 2171
1954 if ($uniq) { 2172 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2173 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2174 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2175 } else {
1963 my ($self) = @_; 2181 my ($self) = @_;
1964 2182
1965 # save first because save cedes 2183 # save first because save cedes
1966 $self->save; 2184 $self->save;
1967 2185
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2186 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2187
1970 return if $self->players; 2188 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2189 return if $self->in_memory != cf::MAP_ACTIVE;
1972 return if $self->{deny_save}; 2190 return if $self->{deny_save};
1973 2191
2192 $self->in_memory (cf::MAP_SWAPPED);
2193
2194 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2196 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2197}
1977 2198
1978sub reset_at { 2199sub reset_at {
1979 my ($self) = @_; 2200 my ($self) = @_;
1980 2201
2012 if $uniq; 2233 if $uniq;
2013 } 2234 }
2014 2235
2015 delete $cf::MAP{$self->path}; 2236 delete $cf::MAP{$self->path};
2016 2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2240 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2241
2021 $self->unlink_save; 2242 $self->unlink_save;
2022 $self->destroy; 2243 $self->destroy;
2023} 2244}
2024 2245
2025my $nuke_counter = "aaaa"; 2246my $nuke_counter = "aaaa";
2026 2247
2027sub nuke { 2248sub nuke {
2028 my ($self) = @_; 2249 my ($self) = @_;
2029 2250
2251 {
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2030 delete $cf::MAP{$self->path}; 2254 delete $cf::MAP{$self->path};
2031 2255
2032 $self->unlink_save; 2256 $self->unlink_save;
2033 2257
2034 bless $self, "cf::map"; 2258 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2259 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2260 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2261 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2263
2040 $cf::MAP{$self->path} = $self; 2264 $cf::MAP{$self->path} = $self;
2265 }
2041 2266
2042 $self->reset; # polite request, might not happen 2267 $self->reset; # polite request, might not happen
2043} 2268}
2044 2269
2045=item $maps = cf::map::tmp_maps 2270=item $maps = cf::map::tmp_maps
2087 2312
2088sub unique_maps() { 2313sub unique_maps() {
2089 [ 2314 [
2090 map { 2315 map {
2091 utf8::decode $_; 2316 utf8::decode $_;
2092 /\.map$/ 2317 s/\.map$//; # TODO future compatibility hack
2318 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2319 ? ()
2093 ? normalise $_ 2320 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2321 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2322 ]
2097} 2323}
2098 2324
2099package cf;
2100
2101=back 2325=back
2102 2326
2103=head3 cf::object 2327=head3 cf::object
2104 2328
2105=cut 2329=cut
2108 2332
2109=over 4 2333=over 4
2110 2334
2111=item $ob->inv_recursive 2335=item $ob->inv_recursive
2112 2336
2113Returns 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.
2114 2339
2115=cut 2340=cut
2116 2341
2117sub inv_recursive_; 2342sub inv_recursive_;
2118sub inv_recursive_ { 2343sub inv_recursive_ {
2121 2346
2122sub inv_recursive { 2347sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2348 inv_recursive_ inv $_[0]
2124} 2349}
2125 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
2126package cf; 2379package cf;
2127 2380
2128=back 2381=back
2129 2382
2130=head3 cf::object::player 2383=head3 cf::object::player
2136Sends 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>
2137can 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
2138dialogue with the given NPC character. 2391dialogue with the given NPC character.
2139 2392
2140=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};
2141 2408
2142# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
2143# with dialog boxes. 2410# with dialog boxes.
2144#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
2145sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
2152 2419
2153 } else { 2420 } else {
2154 my $pl = $self->contr; 2421 my $pl = $self->contr;
2155 2422
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2423 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2424 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2425 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2426
2165 } else { 2427 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2168 } 2430 }
2169 } 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 (@_);
2170} 2442}
2171 2443
2172=item $player_object->may ("access") 2444=item $player_object->may ("access")
2173 2445
2174Returns wether the given player is authorized to access resource "access" 2446Returns wether the given player is authorized to access resource "access"
2187 2459
2188=item $player_object->enter_link 2460=item $player_object->enter_link
2189 2461
2190Freezes 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}>).
2191 2463
2192The 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.
2193I<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.
2194 2468
2195Will never block. 2469Will never block.
2196 2470
2197=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2198 2472
2253 # use -1 or undef as default coordinates, not 0, 0 2527 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2528 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2529 if $x <=0 && $y <= 0;
2256 2530
2257 $map->load; 2531 $map->load;
2258 $map->load_diag; 2532 $map->load_neighbours;
2259 2533
2260 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2261 $self->activate_recursive; 2536 $self->activate_recursive;
2262 2537
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2264 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2265} 2540}
2270her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2271that 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
2272the 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
2273be called at the end of this process. 2548be called at the end of this process.
2274 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
2275=cut 2553=cut
2276 2554
2277our $GOTOGEN; 2555our $GOTOGEN;
2278 2556
2279sub cf::object::player::goto { 2557sub cf::object::player::goto {
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2562
2285 $self->enter_link; 2563 $self->enter_link;
2286 2564
2287 (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
2288 my $map = eval { 2587 my $map = eval {
2289 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2290 2589
2291 if ($map) { 2590 if ($map) {
2292 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2294 } else { 2593 } else {
2295 $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);
2296 } 2595 }
2297 2596
2298 $map 2597 $map
2299 }; 2598 };
2300 2599
2336} 2635}
2337 2636
2338sub prepare_random_map { 2637sub prepare_random_map {
2339 my ($exit) = @_; 2638 my ($exit) = @_;
2340 2639
2341 my $guard = cf::lock_acquire "exit_prepare:$exit";
2342
2343 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2344 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2345 # that depends on the exit object 2642 # that depends on the exit object
2346 2643
2347 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
2349 if ($exit->map) { 2646 if ($exit->map) {
2350 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2351 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2352 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2353 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2354 } 2653 }
2355 2654
2356 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2357 2656
2358 my $data = cf::to_json $rmp; 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2361 2660
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2364 undef $fh; 2663 undef $fh;
2365 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2366 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2367 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2368 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2369 } 2672 }
2370} 2673}
2371 2674
2372sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2373 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2374 2677
2375 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2376 2679
2377 if ($exit->slaying eq "/!") {
2378 #TODO: this should de-fi-ni-te-ly not be a sync-job
2379 # the problem is that $exit might not survive long enough
2380 # so it needs to be done right now, right here
2381 cf::sync_job { prepare_random_map $exit };
2382 }
2383
2384 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2385 my $hp = $exit->stats->hp;
2386 my $sp = $exit->stats->sp;
2387
2388 $self->enter_link; 2680 $self->enter_link;
2389 2681
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2394 (async { 2682 (async {
2395 $self->deactivate_recursive; # just to be sure 2683 $Coro::current->{desc} = "enter_exit";
2684
2396 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
2397 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2398 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
2399 1; 2706 1
2400 }) { 2707 }) {
2401 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2402 . "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. "
2403 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2404 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2405 2712
2406 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
2425 2732
2426 utf8::encode $text; 2733 utf8::encode $text;
2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2734 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2428} 2735}
2429 2736
2430=item $client->send_msg ($color, $type, $msg, [extra...]) 2737=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2738
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2739Send a drawinfo or msg packet to the client, formatting the msg for the
2433client if neccessary. C<$type> should be a string identifying the type of 2740client if neccessary. C<$type> should be a string identifying the type of
2434the 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
2435the message unless the client supports the msg packet. 2742the message unless the client supports the msg packet.
2436 2743
2437=cut 2744=cut
2438 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
2439sub cf::client::send_msg { 2848sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2850
2442 $msg = $self->pl->expand_cfpod ($msg); 2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2853
2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
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
2863 } elsif (ref $channel) {
2864 # send meta info to client, if not yet sent
2865 unless (exists $self->{channel}{$channel->{id}}) {
2866 $self->{channel}{$channel->{id}} = $channel;
2867 $self->ext_msg (channel_info => $channel);
2868 }
2869
2870 $channel = $channel->{id};
2871 }
2443 2872
2444 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2445 2874
2446 if ($self->can_msg) { 2875 # default colour, mask it out
2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2448 } else { 2877 if $color & cf::NDI_DEF;
2449 # replace some tags by gcfclient-compatible ones
2450 for ($msg) {
2451 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457 }
2458 2878
2459 if ($color >= 0) { 2879 my $pkt = "msg "
2460 if (0 && $msg =~ /\[/) { 2880 . $self->{json_coder}->encode (
2461 $self->send_packet ("drawextinfo $color 4 0 $msg") 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2462 } else { 2882 );
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg")
2465 }
2466 }
2467 }
2468}
2469 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
2470=item $client->ext_event ($type, %msg) 2897=item $client->ext_msg ($type, @msg)
2471 2898
2472Sends an ext event to the client. 2899Sends an ext event to the client.
2473 2900
2474=cut 2901=cut
2475 2902
2476sub cf::client::ext_event($$%) { 2903sub cf::client::ext_msg($$@) {
2477 my ($self, $type, %msg) = @_; 2904 my ($self, $type, @msg) = @_;
2478 2905
2479 return unless $self->extcmd; 2906 if ($self->extcmd == 2) {
2480 2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2481 $msg{msgtype} = "event_$type"; 2909 push @msg, msgtype => "event_$type";
2482 $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 }
2483} 2930}
2484 2931
2485=item $success = $client->query ($flags, "text", \&cb) 2932=item $success = $client->query ($flags, "text", \&cb)
2486 2933
2487Queues a query to the client, calling the given callback with 2934Queues a query to the client, calling the given callback with
2542 my ($ns, $buf) = @_; 2989 my ($ns, $buf) = @_;
2543 2990
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2991 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545 2992
2546 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
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3001 if (my $cb = $EXTICMD{$type}) {
2548 if (my %reply = $cb->($ns, $msg)) { 3002 @reply = $cb->($ns, @payload);
2549 $reply{msgid} = $msg->{msgid};
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551 }
2552 } 3003 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
2553 } else { 3008 } else {
2554 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";
2555 } 3010 }
2556 3011
2557 cf::override; 3012 cf::override;
2604our $safe = new Safe "safe"; 3059our $safe = new Safe "safe";
2605our $safe_hole = new Safe::Hole; 3060our $safe_hole = new Safe::Hole;
2606 3061
2607$SIG{FPE} = 'IGNORE'; 3062$SIG{FPE} = 'IGNORE';
2608 3063
2609$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));
2610 3069
2611# here we export the classes and methods available to script code 3070# here we export the classes and methods available to script code
2612 3071
2613=pod 3072=pod
2614 3073
2615The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2616 3075
2617 cf::object 3076 cf::object
2618 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
2619 insert remove 3078 insert remove name archname title slaying race decrease split
3079 value
2620 3080
2621 cf::object::player 3081 cf::object::player
2622 player 3082 player
2623 3083
2624 cf::player 3084 cf::player
2629 3089
2630=cut 3090=cut
2631 3091
2632for ( 3092for (
2633 ["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
2634 insert remove)], 3094 insert remove inv nrof name archname title slaying race
3095 decrease split destroy change_exp value msg lore send_msg)],
2635 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
2636 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
2637 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
2638) { 3099) {
2639 no strict 'refs'; 3100 no strict 'refs';
2640 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
2641 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2658 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
2659 3120
2660 my $qcode = $code; 3121 my $qcode = $code;
2661 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2662 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
2663 3126
2664 local $_; 3127 local $_;
2665 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
2666 3129
2667 my $eval = 3130 my $eval =
2715# the server's init and main functions 3178# the server's init and main functions
2716 3179
2717sub load_facedata($) { 3180sub load_facedata($) {
2718 my ($path) = @_; 3181 my ($path) = @_;
2719 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
2720 warn "loading facedata from $path\n"; 3189 warn "loading facedata from $path\n";
2721 3190
2722 my $facedata; 3191 my $facedata;
2723 0 < aio_load $path, $facedata 3192 0 < aio_load $path, $facedata
2724 or die "$path: $!"; 3193 or die "$path: $!";
2726 $facedata = Coro::Storable::thaw $facedata; 3195 $facedata = Coro::Storable::thaw $facedata;
2727 3196
2728 $facedata->{version} == 2 3197 $facedata->{version} == 2
2729 or cf::cleanup "$path: version mismatch, cannot proceed."; 3198 or cf::cleanup "$path: version mismatch, cannot proceed.";
2730 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
2731 { 3207 {
2732 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
2733 3209
2734 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2735 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
2736 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2740 3217
2741 cf::cede_to_tick; 3218 cf::cede_to_tick;
2742 } 3219 }
2743 3220
2744 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
2745 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
2746 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
2747 or next; 3225 or next;
3226
2748 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
2749 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
2750 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2751 } else { 3230 } else {
2752 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
2769 3248
2770 { 3249 {
2771 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical;
2775 3253
2776 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({ 3255 if (defined $info->{type}) {
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
2784 3258
2785 if ($name =~ /\.jpg$/) { 3259 if ($info->{type} & 1) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3260 # prepend meta info
2787 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};
2788 } else { 3274 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data}; 3275 $RESOURCE{$name} = $info;
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 } 3276 }
2795 3277
2796 cf::cede_to_tick; 3278 cf::cede_to_tick;
2797 } 3279 }
2798 } 3280 }
2799 3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283
2800 1 3284 1
2801} 3285}
2802 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
2803sub 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
2804 load_resource_file "$MAPDIR/regions" 3330 load_resource_file "$MAPDIR/regions"
2805 or die "unable to load regions file\n"; 3331 or die "unable to load regions file\n";
2806 3332
2807 for (cf::region::list) { 3333 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/ 3334 $_->{match} = qr/$_->{match}/
2816} 3342}
2817 3343
2818sub reload_archetypes { 3344sub reload_archetypes {
2819 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
2820 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
2821 #d# NEED to laod twice to resolve forward references
2822 # this really needs to be done in an extra post-pass
2823 # (which needs to be synchronous, so solve it differently)
2824 load_resource_file "$DATADIR/archetypes"
2825 or die "unable to load archetypes\n";
2826} 3347}
2827 3348
2828sub reload_treasures { 3349sub reload_treasures {
2829 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
2830 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
2831} 3352}
2832 3353
2833sub reload_resources { 3354sub reload_resources {
2834 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
2835 3356
3357 reload_facedata;
3358 reload_archetypes;
2836 reload_regions; 3359 reload_regions;
2837 reload_facedata;
2838 #reload_archetypes;#d#
2839 reload_archetypes;
2840 reload_treasures; 3360 reload_treasures;
2841 3361
2842 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
2843} 3363}
2844 3364
2845sub init { 3365sub reload_config {
2846 reload_resources;
2847}
2848
2849sub cfg_load {
2850 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
2851 or return; 3367 or return;
2852 3368
2853 local $/; 3369 local $/;
2854 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
2855 3371
2856 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2857 3373
2858 $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};
2859 $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};
2865 }; 3381 };
2866 warn $@ if $@; 3382 warn $@ if $@;
2867 } 3383 }
2868} 3384}
2869 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
2870sub 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
2871 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
2872 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
2873 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#
2874 (async { 3423 (async {
2875 Event::one_event; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3425 EV::loop EV::LOOP_ONESHOT;
2876 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
2877 }; 3427 };
2878 3428
2879 cfg_load; 3429 evthread_start IO::AIO::poll_fileno;
3430
3431 cf::sync_job {
3432 reload_resources;
3433 reload_config;
2880 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
2881 load_extensions; 3447 load_extensions;
2882 3448
2883 $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
2884 Event::loop; 3457 EV::loop;
2885} 3458}
2886 3459
2887############################################################################# 3460#############################################################################
2888# initialisation and cleanup 3461# initialisation and cleanup
2889 3462
2890# install some emergency cleanup handlers 3463# install some emergency cleanup handlers
2891BEGIN { 3464BEGIN {
3465 our %SIGWATCHER = ();
2892 for my $signal (qw(INT HUP TERM)) { 3466 for my $signal (qw(INT HUP TERM)) {
2893 Event->signal ( 3467 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2894 reentrant => 0,
2895 data => WF_AUTOCANCEL,
2896 signal => $signal,
2897 prio => 0,
2898 cb => sub {
2899 cf::cleanup "SIG$signal"; 3468 cf::cleanup "SIG$signal";
2900 },
2901 ); 3469 };
2902 } 3470 }
2903} 3471}
2904 3472
2905sub write_runtime { 3473sub write_runtime_sync {
2906 my $runtime = "$LOCALDIR/runtime";
2907
2908 # first touch the runtime file to show we are still running: 3474 # first touch the runtime file to show we are still running:
2909 # the fsync below can take a very very long time. 3475 # the fsync below can take a very very long time.
2910 3476
2911 IO::AIO::aio_utime $runtime, undef, undef; 3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2912 3478
2913 my $guard = cf::lock_acquire "write_runtime"; 3479 my $guard = cf::lock_acquire "write_runtime";
2914 3480
2915 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2916 or return; 3482 or return;
2917 3483
2918 my $value = $cf::RUNTIME + 90 + 10; 3484 my $value = $cf::RUNTIME + 90 + 10;
2919 # 10 is the runtime save interval, for a monotonic clock 3485 # 10 is the runtime save interval, for a monotonic clock
2920 # 60 allows for the watchdog to kill the server. 3486 # 60 allows for the watchdog to kill the server.
2930 aio_utime $fh, undef, undef; 3496 aio_utime $fh, undef, undef;
2931 3497
2932 close $fh 3498 close $fh
2933 or return; 3499 or return;
2934 3500
2935 aio_rename "$runtime~", $runtime 3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2936 and return; 3502 and return;
2937 3503
2938 warn "runtime file written.\n"; 3504 warn "runtime file written.\n";
2939 3505
2940 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 };
2941} 3557}
2942 3558
2943sub emergency_save() { 3559sub emergency_save() {
2944 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
2945 3561
2946 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
2947 3563
2948 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
2949 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
2950 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
2951 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
2952 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
2953 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
2954 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
2955 $pl->valid or next; 3576 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2956 $pl->save; 3578 $pl->save;
2957 } 3579 }
2958 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
2959 3581
2960 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
2961 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
2962 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
2963 $map->valid or next; 3585 $map->valid or next;
2964 $map->save; 3586 $map->save;
2965 } 3587 }
2966 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
2967 3589
2968 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
2969 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
2970 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";
2971 }; 3597 };
2972 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
2973 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
2974} 3605}
2975 3606
2976sub post_cleanup { 3607sub post_cleanup {
2977 my ($make_core) = @_; 3608 my ($make_core) = @_;
2978 3609
2979 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
2980 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#
2981} 3641}
2982 3642
2983sub do_reload_perl() { 3643sub do_reload_perl() {
2984 # can/must only be called in main 3644 # can/must only be called in main
2985 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
2986 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
2987 return; 3647 return;
2988 } 3648 }
2989 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
2990 warn "reloading..."; 3655 warn "reloading...";
2991 3656
2992 warn "entering sync_job"; 3657 warn "entering sync_job";
2993 3658
2994 cf::sync_job { 3659 cf::sync_job {
2995 cf::write_runtime; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
2996 cf::emergency_save; 3661 cf::emergency_save;
2997 cf::write_runtime; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
2998 3663
2999 warn "syncing database to disk"; 3664 warn "syncing database to disk";
3000 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
3001 3666
3002 # 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
3003 3668
3004 warn "cancelling all WF_AUTOCANCEL watchers";
3005 for (Event::all_watchers) {
3006 $_->cancel if $_->data & WF_AUTOCANCEL;
3007 }
3008
3009 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
3010 for (;;) {
3011 BDB::flush;
3012 IO::AIO::flush;
3013 Coro::cede;
3014 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
3015 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3016 }
3017
3018 ++$RELOAD;
3019
3020 warn "cancelling all extension coros";
3021 $_->cancel for values %EXT_CORO;
3022 %EXT_CORO = ();
3023
3024 warn "removing commands";
3025 %COMMAND = ();
3026
3027 warn "removing ext/exti commands";
3028 %EXTCMD = ();
3029 %EXTICMD = ();
3030
3031 warn "unloading/nuking all extensions";
3032 for my $pkg (@EXTS) {
3033 warn "... unloading $pkg";
3034
3035 if (my $cb = $pkg->can ("unload")) {
3036 eval {
3037 $cb->($pkg);
3038 1
3039 } or warn "$pkg unloaded, but with errors: $@";
3040 } 3672 }
3041 3673
3042 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
3043 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
3044 } 3676 %EXT_CORO = ();
3045 3677
3046 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
3047 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
3048 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3049 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
3050 warn "... unloading $k"; 3687 warn "... unloading $pkg";
3051 delete $INC{$k};
3052 3688
3053 $k =~ s/\.pm$//;
3054 $k =~ s/\//::/g;
3055
3056 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
3057 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
3058 } 3698 }
3059 3699
3060 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;
3061 } 3715 }
3062 3716
3063 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
3064 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
3065 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);
3066 3720
3067 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3068 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3069 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3070 3724
3071 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3072 # and global variables created in xs 3726 # and global variables created in xs
3073 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3074 3728
3075 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
3076 3730
3077 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
3078 require cf; 3732 require cf;
3079 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3080 3734
3081 warn "loading config and database again"; 3735 warn "loading config and database again";
3082 cf::cfg_load; 3736 cf::reload_config;
3083 3737
3084 warn "loading extensions"; 3738 warn "loading extensions";
3085 cf::load_extensions; 3739 cf::load_extensions;
3086 3740
3741 if ($REATTACH_ON_RELOAD) {
3087 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3088 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3089 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3090 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3091 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3092 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3093 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
3094 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3095 3754
3096 1 3755 1
3097 } or do { 3756 } or do {
3098 warn $@; 3757 warn $@;
3099 warn "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
3100 exit 1;
3101 }; 3759 };
3102 3760
3103 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3104}; 3767};
3105 3768
3106our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3107 3770
3108sub reload_perl() { 3771sub reload_perl() {
3109 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3110 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3111 3774
3112 $RELOAD_WATCHER ||= Event->timer ( 3775 $RELOAD_WATCHER ||= cf::async {
3113 reentrant => 0, 3776 Coro::AIO::aio_wait cache_extensions;
3114 after => 0, 3777
3115 data => WF_AUTOCANCEL, 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3116 cb => sub {
3117 do_reload_perl; 3779 do_reload_perl;
3118 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3119 }, 3781 };
3120 ); 3782 };
3121} 3783}
3122 3784
3123register_command "reload" => sub { 3785register_command "reload" => sub {
3124 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
3125 3787
3126 if ($who->flag (FLAG_WIZ)) { 3788 if ($who->flag (FLAG_WIZ)) {
3127 $who->message ("reloading server."); 3789 $who->message ("reloading server.");
3790 async {
3791 $Coro::current->{desc} = "perl_reload";
3128 async { reload_perl }; 3792 reload_perl;
3793 };
3129 } 3794 }
3130}; 3795};
3131 3796
3132unshift @INC, $LIBDIR; 3797unshift @INC, $LIBDIR;
3133 3798
3135 3800
3136our @WAIT_FOR_TICK; 3801our @WAIT_FOR_TICK;
3137our @WAIT_FOR_TICK_BEGIN; 3802our @WAIT_FOR_TICK_BEGIN;
3138 3803
3139sub wait_for_tick { 3804sub wait_for_tick {
3140 return unless $TICK_WATCHER->is_active;
3141 return if $Coro::current == $Coro::main; 3805 return if tick_inhibit || $Coro::current == $Coro::main;
3142 3806
3143 my $signal = new Coro::Signal; 3807 my $signal = new Coro::Signal;
3144 push @WAIT_FOR_TICK, $signal; 3808 push @WAIT_FOR_TICK, $signal;
3145 $signal->wait; 3809 $signal->wait;
3146} 3810}
3147 3811
3148sub wait_for_tick_begin { 3812sub wait_for_tick_begin {
3149 return unless $TICK_WATCHER->is_active;
3150 return if $Coro::current == $Coro::main; 3813 return if tick_inhibit || $Coro::current == $Coro::main;
3151 3814
3152 my $signal = new Coro::Signal; 3815 my $signal = new Coro::Signal;
3153 push @WAIT_FOR_TICK_BEGIN, $signal; 3816 push @WAIT_FOR_TICK_BEGIN, $signal;
3154 $signal->wait; 3817 $signal->wait;
3155} 3818}
3156 3819
3157 my $min = 1e6;#d# 3820sub tick {
3158 my $avg = 10;
3159$TICK_WATCHER = Event->timer (
3160 reentrant => 0,
3161 parked => 1,
3162 prio => 0,
3163 at => $NEXT_TICK || $TICK,
3164 data => WF_AUTOCANCEL,
3165 cb => sub {
3166 if ($Coro::current != $Coro::main) { 3821 if ($Coro::current != $Coro::main) {
3167 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"
3168 unless ++$bug_warning > 10; 3823 unless ++$bug_warning > 10;
3169 return; 3824 return;
3170 } 3825 }
3171 3826
3172 $NOW = $tick_start = Event::time;
3173
3174 cf::server_tick; # one server iteration 3827 cf::server_tick; # one server iteration
3175 3828
3176 0 && sync_job {#d# 3829 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3177 for(1..10) { 3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3178 my $t = Event::time; 3831 Coro::async_pool {
3179 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3832 $Coro::current->{desc} = "runtime saver";
3180 or die; 3833 write_runtime_sync
3181 3834 or warn "ERROR: unable to write runtime file: $!";
3182 $map->width (50);
3183 $map->height (50);
3184 $map->alloc;
3185 $map->_load_objects ("/tmp/x.map", 1);
3186 my $t = Event::time - $t;
3187
3188 #next unless $t < 0.0013;#d#
3189 if ($t < $min) {
3190 $min = $t;
3191 }
3192 $avg = $avg * 0.99 + $t * 0.01;
3193 }
3194 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3195 exit 0;
3196 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3197 }; 3835 };
3836 }
3198 3837
3199 $RUNTIME += $TICK;
3200 $NEXT_TICK += $TICK;
3201
3202 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3203 $NEXT_RUNTIME_WRITE = $NOW + 10;
3204 Coro::async_pool {
3205 write_runtime
3206 or warn "ERROR: unable to write runtime file: $!";
3207 };
3208 }
3209
3210# my $AFTER = Event::time;
3211# warn $AFTER - $NOW;#d#
3212
3213 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3214 $sig->send; 3839 $sig->send;
3215 } 3840 }
3216 while (my $sig = shift @WAIT_FOR_TICK) { 3841 while (my $sig = shift @WAIT_FOR_TICK) {
3217 $sig->send; 3842 $sig->send;
3218 } 3843 }
3219 3844
3220 $NOW = Event::time; 3845 $LOAD = ($NOW - $TICK_START) / $TICK;
3221
3222 # if we are delayed by four ticks or more, skip them all
3223 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3224
3225 $TICK_WATCHER->at ($NEXT_TICK);
3226 $TICK_WATCHER->start;
3227
3228 $LOAD = ($NOW - $tick_start) / $TICK;
3229 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3230 3847
3231 _post_tick; 3848 if (0) {
3232 3849 if ($NEXT_TICK) {
3233 3850 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d#
3853 }
3234 }, 3854 }
3235); 3855}
3236 3856
3237{ 3857{
3238 BDB::max_poll_time $TICK * 0.1; 3858 # configure BDB
3239 $BDB_POLL_WATCHER = Event->io ( 3859
3240 reentrant => 0,
3241 fd => BDB::poll_fileno,
3242 poll => 'r',
3243 prio => 0,
3244 data => WF_AUTOCANCEL,
3245 cb => \&BDB::poll_cb,
3246 );
3247 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3248 3861 BDB::max_poll_reqs $TICK * 0.1;
3249 BDB::set_sync_prepare { 3862 $AnyEvent::BDB::WATCHER->priority (1);
3250 my $status;
3251 my $current = $Coro::current;
3252 (
3253 sub {
3254 $status = $!;
3255 $current->ready; undef $current;
3256 },
3257 sub {
3258 Coro::schedule while defined $current;
3259 $! = $status;
3260 },
3261 )
3262 };
3263 3863
3264 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3265 $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);
3266 3871
3267 cf::sync_job { 3872 cf::sync_job {
3268 eval { 3873 eval {
3269 BDB::db_env_open 3874 BDB::db_env_open
3270 $DB_ENV, 3875 $DB_ENV,
3272 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
3273 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3878 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3274 0666; 3879 0666;
3275 3880
3276 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3881 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3277
3278 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3279 $DB_ENV->set_lk_detect;
3280 }; 3882 };
3281 3883
3282 cf::cleanup "db_env_open(db): $@" if $@; 3884 cf::cleanup "db_env_open(db): $@" if $@;
3283 }; 3885 };
3284 } 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 };
3285} 3897}
3286 3898
3287{ 3899{
3900 # configure IO::AIO
3901
3288 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3289
3290 undef $Coro::AIO::WATCHER;
3291 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3292 $AIO_POLL_WATCHER = Event->io ( 3904 undef $AnyEvent::AIO::WATCHER;
3293 reentrant => 0,
3294 data => WF_AUTOCANCEL,
3295 fd => IO::AIO::poll_fileno,
3296 poll => 'r',
3297 prio => 6,
3298 cb => \&IO::AIO::poll_cb,
3299 );
3300} 3905}
3301 3906
3302my $_log_backtrace; 3907my $_log_backtrace;
3303 3908
3304sub _log_backtrace { 3909sub _log_backtrace {
3307 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3308 3913
3309 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3310 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3311 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3312 async { 3918 async {
3919 $Coro::current->{desc} = "abt $msg";
3920
3313 my @bt = fork_call { 3921 my @bt = fork_call {
3314 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3315 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3923 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3316 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 |"
3317 or die "addr2line: $!"; 3925 or die "addr2line: $!";
3325 } 3933 }
3326 3934
3327 @funcs 3935 @funcs
3328 }; 3936 };
3329 3937
3330 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3331 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3332 --$_log_backtrace; 3941 --$_log_backtrace;
3333 }; 3942 };
3334 } else { 3943 } else {
3335 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3336 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3337 } 3946 }
3338} 3947}
3339 3948
3340# load additional modules 3949# load additional modules
3341use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3342 3951
3343END { cf::emergency_save } 3952END { cf::emergency_save }
3344 3953
33451 39541
3346 3955

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines