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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.478 by root, Thu Sep 17 01:57:31 2009 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines