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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.470 by root, Sun Apr 26 19:42:45 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines