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.318 by root, Tue Jul 24 04:55:34 2007 UTC vs.
Revision 1.470 by root, Sun Apr 26 19:42:45 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines