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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines