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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.464 by root, Thu Jan 1 18:35:48 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines