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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines