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.324 by root, Sat Jul 28 14:23:17 2007 UTC vs.
Revision 1.463 by root, Sun Dec 28 06:59:27 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines