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.109 by root, Sun Dec 31 22:23:12 2006 UTC vs.
Revision 1.158 by root, Wed Jan 10 19:52:43 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
37our %EXTCMD = (); 38our %EXTCMD = ();
38 39
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
57 61
58binmode STDOUT; 62binmode STDOUT;
59binmode STDERR; 63binmode STDERR;
60 64
61# read virtual server time, if available 65# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 75mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 76mkdir $RANDOM_MAPS;
73 77
74# a special map that is always available 78# a special map that is always available
75our $LINK_MAP; 79our $LINK_MAP;
80our $EMERGENCY_POSITION;
76 81
77############################################################################# 82#############################################################################
78 83
79=head2 GLOBAL VARIABLES 84=head2 GLOBAL VARIABLES
80 85
104 109
105=item %cf::CFG 110=item %cf::CFG
106 111
107Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 113from wherever your confdir points to.
114
115=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
116
117These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
118or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
119processing has been done. Call C<< ->wait >> on them to maximise the
120window of cpu time available, or simply to synchronise to the server tick.
109 121
110=back 122=back
111 123
112=cut 124=cut
113 125
117 utf8::encode $msg; 129 utf8::encode $msg;
118 130
119 $msg .= "\n" 131 $msg .= "\n"
120 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
121 133
122 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
123 }; 135 };
124} 136}
125 137
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
153 165
154=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
155 167
156=over 4 168=over 4
157 169
170=item dumpval $ref
171
158=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
159 192
160use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
161 194
162=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
163 196
178 211
179sub to_json($) { 212sub to_json($) {
180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
182} 215}
216
217=item cf::lock_wait $string
218
219Wait until the given lock is available. See cf::lock_acquire.
220
221=item my $lock = cf::lock_acquire $string
222
223Wait until the given lock is available and then acquires it and returns
224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
225for example when the coroutine gets canceled), the lock is automatically
226returned.
227
228Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load).
230
231=cut
232
233our %LOCK;
234
235sub lock_wait($) {
236 my ($key) = @_;
237
238 # wait for lock, if any
239 while ($LOCK{$key}) {
240 push @{ $LOCK{$key} }, $Coro::current;
241 Coro::schedule;
242 }
243}
244
245sub lock_acquire($) {
246 my ($key) = @_;
247
248 # wait, to be sure we are not locked
249 lock_wait $key;
250
251 $LOCK{$key} = [];
252
253 Coro::guard {
254 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} };
256 }
257}
258
259sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active;
261
262 my $guard = Coro::guard { $TICK_WATCHER->start };
263 $TICK_WATCHER->stop;
264 $guard
265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
183 276
184=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
185 278
186The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
187always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
195=cut 288=cut
196 289
197sub sync_job(&) { 290sub sync_job(&) {
198 my ($job) = @_; 291 my ($job) = @_;
199 292
200 my $busy = 1;
201 my @res;
202
203 # TODO: use suspend/resume instead
204 local $FREEZE = 1;
205
206 my $coro = Coro::async {
207 @res = eval { $job->() };
208 warn $@ if $@;
209 undef $busy;
210 };
211
212 if ($Coro::current == $Coro::main) { 293 if ($Coro::current == $Coro::main) {
294 # this is the main coro, too bad, we have to block
295 # till the operation succeeds, freezing the server :/
296
297 # TODO: use suspend/resume instead
298 # (but this is cancel-safe)
299 my $freeze_guard = freeze_mainloop;
300
301 my $busy = 1;
302 my @res;
303
304 (async {
305 @res = eval { $job->() };
306 warn $@ if $@;
307 undef $busy;
213 $coro->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
309
214 while ($busy) { 310 while ($busy) {
215 Coro::cede_notself; 311 Coro::cede or Event::one_event;
216 Event::one_event unless Coro::nready;
217 } 312 }
313
314 wantarray ? @res : $res[0]
218 } else { 315 } else {
219 $coro->join; 316 # we are in another coroutine, how wonderful, everything just works
317
318 $job->()
220 } 319 }
221
222 wantarray ? @res : $res[0]
223} 320}
224 321
225=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
226 323
227Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
228when the extension calling this is being unloaded. 325extension calling this is being unloaded.
229 326
230=cut 327=cut
231 328
232sub coro(&) { 329sub async_ext(&) {
233 my $cb = shift; 330 my $cb = shift;
234 331
235 my $coro; $coro = async { 332 my $coro = &Coro::async ($cb);
236 eval {
237 $cb->();
238 };
239 warn $@ if $@;
240 };
241 333
242 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
243 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
244 }); 336 });
245 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
251 my $runtime = cf::localdir . "/runtime"; 343 my $runtime = cf::localdir . "/runtime";
252 344
253 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 345 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
254 or return; 346 or return;
255 347
256 my $value = $cf::RUNTIME; 348 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
257 (aio_write $fh, 0, (length $value), $value, 0) <= 0 349 (aio_write $fh, 0, (length $value), $value, 0) <= 0
258 and return; 350 and return;
259 351
260 aio_fsync $fh 352 aio_fsync $fh
261 and return; 353 and return;
275 367
276############################################################################# 368#############################################################################
277 369
278package cf::path; 370package cf::path;
279 371
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
280sub new { 378sub new {
281 my ($class, $path, $base) = @_; 379 my ($class, $path, $base) = @_;
282 380
381 $path = $path->as_string if ref $path;
382
283 my $self = bless { }, $class; 383 my $self = bless { }, $class;
284 384
385 # {... are special paths that are not touched
386 # ?xxx/... are special absolute paths
387 # ?random/... random maps
388 # /! non-realised random map exit
389 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE)
391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
394
395 if ($path =~ /^{/) {
396 # fine as it is
285 if ($path =~ s{^\?random/}{}) { 397 } elsif ($path =~ s{^\?random/}{}) {
286 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
287 $self->{random} = cf::from_json $data; 399 $self->{random} = cf::from_json $data;
288 } else { 400 } else {
289 if ($path =~ s{^~([^/]+)?}{}) { 401 if ($path =~ s{^~([^/]+)?}{}) {
290 $self->{user_rel} = 1; 402 $self->{user_rel} = 1;
335# } 447# }
336} 448}
337 449
338# escape the /'s in the path 450# escape the /'s in the path
339sub _escaped_path { 451sub _escaped_path {
340 # ∕ is U+2215
341 (my $path = $_[0]{path}) =~ s/\///g; 452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
342 $path 453 $path
343} 454}
344 455
345# the original (read-only) location 456# the original (read-only) location
346sub load_path { 457sub load_path {
795 or return; 906 or return;
796 907
797 unless (aio_stat "$filename.pst") { 908 unless (aio_stat "$filename.pst") {
798 (aio_load "$filename.pst", $av) >= 0 909 (aio_load "$filename.pst", $av) >= 0
799 or return; 910 or return;
800 $av = eval { (Storable::thaw <$av>)->{objs} }; 911 $av = eval { (Storable::thaw $av)->{objs} };
801 } 912 }
802 913
914 warn sprintf "loading %s (%d)\n",
915 $filename, length $data, scalar @{$av || []};#d#
803 return ($data, $av); 916 return ($data, $av);
804} 917}
805 918
806############################################################################# 919#############################################################################
807# command handling &c 920# command handling &c
971}; 1084};
972 1085
973cf::map->attach (prio => -10000, package => cf::mapsupport::); 1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
974 1087
975############################################################################# 1088#############################################################################
976# load/save perl data associated with player->ob objects
977 1089
978sub all_objects(@) { 1090=head2 CORE EXTENSIONS
979 @_, map all_objects ($_->inv), @_
980}
981 1091
982# TODO: compatibility cruft, remove when no longer needed 1092Functions and methods that extend core crossfire objects.
983cf::player->attach ( 1093
984 on_load => sub { 1094=cut
1095
1096package cf::player;
1097
1098use Coro::AIO;
1099
1100=head3 cf::player
1101
1102=over 4
1103
1104=item cf::player::find $login
1105
1106Returns the given player object, loading it if necessary (might block).
1107
1108=cut
1109
1110sub playerdir($) {
1111 cf::localdir
1112 . "/"
1113 . cf::playerdir
1114 . "/"
1115 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1116}
1117
1118sub path($) {
1119 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1120
1121 (playerdir $login) . "/$login.pl"
1122}
1123
1124sub find_active($) {
1125 $cf::PLAYER{$_[0]}
1126 and $cf::PLAYER{$_[0]}->active
1127 and $cf::PLAYER{$_[0]}
1128}
1129
1130sub exists($) {
1131 my ($login) = @_;
1132
1133 $cf::PLAYER{$login}
1134 or cf::sync_job { !aio_stat $login }
1135}
1136
1137sub find($) {
1138 return $cf::PLAYER{$_[0]} || do {
1139 my $login = $_[0];
1140
1141 my $guard = cf::lock_acquire "user_find:$login";
1142
1143 $cf::PLAYER{$_[0]} || do {
1144 my $pl = load_pl path $login
1145 or return;
1146 $cf::PLAYER{$login} = $pl
1147 }
1148 }
1149}
1150
1151sub save($) {
1152 my ($pl) = @_;
1153
1154 return if $pl->{deny_save};
1155
1156 my $path = path $pl;
1157 my $guard = cf::lock_acquire "user_save:$path";
1158
1159 return if $pl->{deny_save};
1160
1161 aio_mkdir playerdir $pl, 0770;
1162 $pl->{last_save} = $cf::RUNTIME;
1163
1164 $pl->save_pl ($path);
1165 Coro::cede;
1166}
1167
1168sub new($) {
1169 my ($login) = @_;
1170
1171 my $self = create;
1172
1173 $self->ob->name ($login);
1174 $self->{deny_save} = 1;
1175
1176 $cf::PLAYER{$login} = $self;
1177
1178 $self
1179}
1180
1181=item $pl->quit_character
1182
1183Nukes the player without looking back. If logged in, the connection will
1184be destroyed. May block for a long time.
1185
1186=cut
1187
1188sub quit_character {
1189 my ($pl) = @_;
1190
1191 $pl->{deny_save} = 1;
1192 $pl->password ("*"); # this should lock out the player until we nuked the dir
1193
1194 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1195 $pl->deactivate;
1196 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1197 $pl->ns->destroy if $pl->ns;
1198
1199 my $path = playerdir $pl;
1200 my $temp = "$path~$cf::RUNTIME~deleting~";
1201 aio_rename $path, $temp;
1202 delete $cf::PLAYER{$pl->ob->name};
1203 $pl->destroy;
1204 IO::AIO::aio_rmtree $temp;
1205}
1206
1207=item cf::player::list_logins
1208
1209Returns am arrayref of all valid playernames in the system, can take a
1210while and may block, so not sync_job-capable, ever.
1211
1212=cut
1213
1214sub list_logins {
1215 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1216 or return [];
1217
1218 my @logins;
1219
1220 for my $login (@$dirs) {
1221 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1222 aio_read $fh, 0, 512, my $buf, 0 or next;
1223 $buf !~ /^password -------------$/m or next; # official not-valid tag
1224
1225 utf8::decode $login;
1226 push @logins, $login;
1227 }
1228
1229 \@logins
1230}
1231
1232=item $player->maps
1233
1234Returns an arrayref of cf::path's of all maps that are private for this
1235player. May block.
1236
1237=cut
1238
1239sub maps($) {
1240 my ($pl) = @_;
1241
1242 my $files = aio_readdir playerdir $pl
1243 or return;
1244
1245 my @paths;
1246
1247 for (@$files) {
1248 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o;
1251
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1253 }
1254
1255 \@paths
1256}
1257
1258=item $player->ext_reply ($msgid, $msgtype, %msg)
1259
1260Sends an ext reply to the player.
1261
1262=cut
1263
1264sub ext_reply($$$%) {
1265 my ($self, $id, %msg) = @_;
1266
1267 $msg{msgid} = $id;
1268
1269 $self->send ("ext " . cf::to_json \%msg);
1270}
1271
1272package cf;
1273
1274=back
1275
1276
1277=head3 cf::map
1278
1279=over 4
1280
1281=cut
1282
1283package cf::map;
1284
1285use Fcntl;
1286use Coro::AIO;
1287
1288our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000;
1290
1291sub generate_random_map {
1292 my ($path, $rmp) = @_;
1293
1294 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (cf::region::find $rmp->{region})
1308}
1309
1310# and all this just because we cannot iterate over
1311# all maps in C++...
1312sub change_all_map_light {
1313 my ($change) = @_;
1314
1315 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP;
1317}
1318
1319sub try_load_header($) {
985 my ($pl, $path) = @_; 1320 my ($path) = @_;
986 1321
987 for my $o (all_objects $pl->ob) { 1322 utf8::encode $path;
988 if (my $value = $o->get_ob_key_value ("_perl_data")) { 1323 aio_open $path, O_RDONLY, 0
989 $o->set_ob_key_value ("_perl_data"); 1324 or return;
990 1325
991 %$o = %{ Storable::thaw pack "H*", $value }; 1326 my $map = cf::map::new
1327 or return;
1328
1329 # for better error messages only, will be overwritten
1330 $map->path ($path);
1331
1332 $map->load_header ($path)
1333 or return;
1334
1335 $map->{load_path} = $path;
1336
1337 $map
1338}
1339
1340sub find;
1341sub find {
1342 my ($path, $origin) = @_;
1343
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348
1349 cf::lock_wait "map_find:$key";
1350
1351 $cf::MAP{$key} || do {
1352 my $guard = cf::lock_acquire "map_find:$key";
1353
1354 # do it the slow way
1355 my $map = try_load_header $path->save_path;
1356
1357 Coro::cede;
1358
1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $map->{instantiate_time} = $cf::RUNTIME
1364 if $map->{instantiate_time} > $cf::RUNTIME;
1365 } else {
1366 if (my $rmp = $path->random_map_params) {
1367 $map = generate_random_map $key, $rmp;
1368 } else {
1369 $map = try_load_header $path->load_path;
992 } 1370 }
1371
1372 $map or return;
1373
1374 $map->{load_original} = 1;
1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1377 $map->instantiate;
1378
1379 # per-player maps become, after loading, normal maps
1380 $map->per_player (0) if $path->{user_rel};
993 } 1381 }
1382
1383 $map->path ($key);
1384 $map->{path} = $path;
1385 $map->{last_save} = $cf::RUNTIME;
1386
1387 Coro::cede;
1388
1389 if ($map->should_reset) {
1390 $map->reset;
1391 undef $guard;
1392 $map = find $path
1393 or return;
1394 }
1395
1396 $cf::MAP{$key} = $map
994 }, 1397 }
995); 1398}
996 1399
997############################################################################# 1400sub load {
1401 my ($self) = @_;
998 1402
999=head2 CORE EXTENSIONS 1403 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1000 1405
1001Functions and methods that extend core crossfire objects. 1406 return if $self->in_memory != cf::MAP_SWAPPED;
1002 1407
1003=head3 cf::player 1408 $self->in_memory (cf::MAP_LOADING);
1409
1410 $self->alloc;
1411 $self->load_objects ($self->{load_path}, 1)
1412 or return;
1413
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original};
1416
1417 if (my $uniq = $path->uniq_path) {
1418 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0);
1422 }
1423 }
1424
1425 Coro::cede;
1426
1427 # now do the right thing for maps
1428 $self->link_multipart_objects;
1429
1430 if ($self->{path}->is_style_map) {
1431 $self->{deny_save} = 1;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons;
1437 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty;
1440 $self->activate;
1441 }
1442
1443 Coro::cede;
1444
1445 $self->in_memory (cf::MAP_IN_MEMORY);
1446}
1447
1448# find and load all maps in the 3x3 area around a map
1449sub load_diag {
1450 my ($map) = @_;
1451
1452 my @diag; # diagonal neighbours
1453
1454 for (0 .. 3) {
1455 my $neigh = $map->tile_path ($_)
1456 or next;
1457 $neigh = find $neigh, $map
1458 or next;
1459 $neigh->load;
1460
1461 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1462 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1463 }
1464
1465 for (@diag) {
1466 my $neigh = find @$_
1467 or next;
1468 $neigh->load;
1469 }
1470}
1471
1472sub find_sync {
1473 my ($path, $origin) = @_;
1474
1475 cf::sync_job { find $path, $origin }
1476}
1477
1478sub do_load_sync {
1479 my ($map) = @_;
1480
1481 cf::sync_job { $map->load };
1482}
1483
1484our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async {
1486 while () {
1487 while (%MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495 }
1496 Coro::schedule;
1497 }
1498};
1499
1500sub find_async {
1501 my ($path, $origin) = @_;
1502
1503 $path = new cf::path $path, $origin && $origin->path;
1504 my $key = $path->as_string;
1505
1506 if (my $map = $cf::MAP{$key}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 }
1509
1510 $MAP_PREFETCH{$key} = $path;
1511 $MAP_PREFETCHER->ready;
1512
1513 ()
1514}
1515
1516sub save {
1517 my ($self) = @_;
1518
1519 my $lock = cf::lock_acquire "map_data:" . $self->path;
1520
1521 $self->{last_save} = $cf::RUNTIME;
1522
1523 return unless $self->dirty;
1524
1525 my $save = $self->{path}->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1527
1528 $self->{load_path} = $save;
1529
1530 return if $self->{deny_save};
1531
1532 local $self->{last_access} = $self->last_access;#d#
1533
1534 cf::async {
1535 $_->contr->save for $self->players;
1536 };
1537
1538 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES);
1541 } else {
1542 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1543 }
1544}
1545
1546sub swap_out {
1547 my ($self) = @_;
1548
1549 # save first because save cedes
1550 $self->save;
1551
1552 my $lock = cf::lock_acquire "map_data:" . $self->path;
1553
1554 return if $self->players;
1555 return if $self->in_memory != cf::MAP_IN_MEMORY;
1556 return if $self->{deny_save};
1557
1558 $self->clear;
1559 $self->in_memory (cf::MAP_SWAPPED);
1560}
1561
1562sub reset_at {
1563 my ($self) = @_;
1564
1565 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel};
1567 return 1e99 if $self->{deny_reset};
1568
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1571
1572 $time + $to
1573}
1574
1575sub should_reset {
1576 my ($self) = @_;
1577
1578 $self->reset_at <= $cf::RUNTIME
1579}
1580
1581sub unlink_save {
1582 my ($self) = @_;
1583
1584 utf8::encode (my $save = $self->{path}->save_path);
1585 aioreq_pri 3; IO::AIO::aio_unlink $save;
1586 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1587}
1588
1589sub rename {
1590 my ($self, $new_path) = @_;
1591
1592 $self->unlink_save;
1593
1594 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path;
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self;
1598
1599 $self->save;
1600}
1601
1602sub reset {
1603 my ($self) = @_;
1604
1605 my $lock = cf::lock_acquire "map_data:" . $self->path;
1606
1607 return if $self->players;
1608 return if $self->{path}{user_rel};#d#
1609
1610 warn "resetting map ", $self->path;#d#
1611
1612 delete $cf::MAP{$self->path};
1613
1614 $_->clear_links_to ($self) for values %cf::MAP;
1615
1616 $self->unlink_save;
1617 $self->destroy;
1618}
1619
1620my $nuke_counter = "aaaa";
1621
1622sub nuke {
1623 my ($self) = @_;
1624
1625 $self->{deny_save} = 1;
1626 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++));
1628 $self->reset; # polite request, might not happen
1629}
1630
1631sub customise_for {
1632 my ($map, $ob) = @_;
1633
1634 if ($map->per_player) {
1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1636 }
1637
1638 $map
1639}
1640
1641=item cf::map::unique_maps
1642
1643Returns an arrayref of cf::path's of all shared maps that have
1644instantiated unique items. May block.
1645
1646=cut
1647
1648sub unique_maps() {
1649 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1650 or return;
1651
1652 my @paths;
1653
1654 for (@$files) {
1655 utf8::decode $_;
1656 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o;
1658
1659 push @paths, new cf::path $_;
1660 }
1661
1662 \@paths
1663}
1664
1665package cf;
1666
1667=back
1668
1669=head3 cf::object
1670
1671=cut
1672
1673package cf::object;
1004 1674
1005=over 4 1675=over 4
1006 1676
1007=item cf::player::exists $login 1677=item $ob->inv_recursive
1008 1678
1009Returns true when the given account exists. 1679Returns the inventory of the object _and_ their inventories, recursively.
1010 1680
1011=cut 1681=cut
1012 1682
1013sub cf::player::exists($) { 1683sub inv_recursive_;
1014 cf::player::find $_[0] 1684sub inv_recursive_ {
1015 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1685 map { $_, inv_recursive_ $_->inv } @_
1016} 1686}
1017 1687
1018=item $player->ext_reply ($msgid, $msgtype, %msg) 1688sub inv_recursive {
1019 1689 inv_recursive_ inv $_[0]
1020Sends an ext reply to the player.
1021
1022=cut
1023
1024sub cf::player::ext_reply($$$%) {
1025 my ($self, $id, %msg) = @_;
1026
1027 $msg{msgid} = $id;
1028
1029 $self->send ("ext " . to_json \%msg);
1030} 1690}
1691
1692package cf;
1031 1693
1032=back 1694=back
1033 1695
1034=head3 cf::object::player 1696=head3 cf::object::player
1035 1697
1073 (ref $cf::CFG{"may_$access"} 1735 (ref $cf::CFG{"may_$access"}
1074 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1736 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1075 : $cf::CFG{"may_$access"}) 1737 : $cf::CFG{"may_$access"})
1076} 1738}
1077 1739
1740=item $player_object->enter_link
1741
1742Freezes the player and moves him/her to a special map (C<{link}>).
1743
1744The player should be reaosnably safe there for short amounts of time. You
1745I<MUST> call C<leave_link> as soon as possible, though.
1746
1747=item $player_object->leave_link ($map, $x, $y)
1748
1749Moves the player out of the specila link map onto the given map. If the
1750map is not valid (or omitted), the player will be moved back to the
1751location he/she was before the call to C<enter_link>, or, if that fails,
1752to the emergency map position.
1753
1754Might block.
1755
1756=cut
1757
1758sub cf::object::player::enter_link {
1759 my ($self) = @_;
1760
1761 $self->deactivate_recursive;
1762
1763 return if $self->map == $LINK_MAP;
1764
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map;
1767
1768 $self->enter_map ($LINK_MAP, 20, 20);
1769}
1770
1771sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_;
1773
1774 my $link_pos = delete $self->{_link_pos};
1775
1776 unless ($map) {
1777 # restore original map position
1778 ($map, $x, $y) = @{ $link_pos || [] };
1779 $map = cf::map::find $map;
1780
1781 unless ($map) {
1782 ($map, $x, $y) = @$EMERGENCY_POSITION;
1783 $map = cf::map::find $map
1784 or die "FATAL: cannot load emergency map\n";
1785 }
1786 }
1787
1788 ($x, $y) = (-1, -1)
1789 unless (defined $x) && (defined $y);
1790
1791 # use -1 or undef as default coordinates, not 0, 0
1792 ($x, $y) = ($map->enter_x, $map->enter_y)
1793 if $x <=0 && $y <= 0;
1794
1795 $map->load;
1796 $map->load_diag;
1797
1798 return unless $self->contr->active;
1799 $self->activate_recursive;
1800 $self->enter_map ($map, $x, $y);
1801}
1802
1803cf::player->attach (
1804 on_logout => sub {
1805 my ($pl) = @_;
1806
1807 # abort map switching before logout
1808 if ($pl->ob->{_link_pos}) {
1809 cf::sync_job {
1810 $pl->ob->leave_link
1811 };
1812 }
1813 },
1814 on_login => sub {
1815 my ($pl) = @_;
1816
1817 # try to abort aborted map switching on player login :)
1818 # should happen only on crashes
1819 if ($pl->ob->{_link_pos}) {
1820 $pl->ob->enter_link;
1821 (async {
1822 # we need this sleep as the login has a concurrent enter_exit running
1823 # and this sleep increases chances of the player not ending up in scorn
1824 $pl->ob->reply (undef,
1825 "There was an internal problem at your last logout, "
1826 . "the server will try to bring you to your intended destination in a second.",
1827 cf::NDI_RED);
1828 Coro::Timer::sleep 1;
1829 $pl->ob->leave_link;
1830 })->prio (2);
1831 }
1832 },
1833);
1834
1835=item $player_object->goto ($path, $x, $y)
1836
1837=cut
1838
1839sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_;
1841
1842 $path = new cf::path $path;
1843
1844 $self->enter_link;
1845
1846 (async {
1847 my $map = cf::map::find $path->as_string;
1848 $map = $map->customise_for ($self) if $map;
1849
1850# warn "entering ", $map->path, " at ($x, $y)\n"
1851# if $map;
1852
1853 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1854
1855 $self->leave_link ($map, $x, $y);
1856 })->prio (1);
1857}
1858
1859=item $player_object->enter_exit ($exit_object)
1860
1861=cut
1862
1863sub parse_random_map_params {
1864 my ($spec) = @_;
1865
1866 my $rmp = { # defaults
1867 xsize => 10,
1868 ysize => 10,
1869 };
1870
1871 for (split /\n/, $spec) {
1872 my ($k, $v) = split /\s+/, $_, 2;
1873
1874 $rmp->{lc $k} = $v if (length $k) && (length $v);
1875 }
1876
1877 $rmp
1878}
1879
1880sub prepare_random_map {
1881 my ($exit) = @_;
1882
1883 # all this does is basically replace the /! path by
1884 # a new random map path (?random/...) with a seed
1885 # that depends on the exit object
1886
1887 my $rmp = parse_random_map_params $exit->msg;
1888
1889 if ($exit->map) {
1890 $rmp->{region} = $exit->map->region_name;
1891 $rmp->{origin_map} = $exit->map->path;
1892 $rmp->{origin_x} = $exit->x;
1893 $rmp->{origin_y} = $exit->y;
1894 }
1895
1896 $rmp->{random_seed} ||= $exit->random_seed;
1897
1898 my $data = cf::to_json $rmp;
1899 my $md5 = Digest::MD5::md5_hex $data;
1900
1901 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) {
1902 aio_write $fh, 0, (length $data), $data, 0;
1903
1904 $exit->slaying ("?random/$md5");
1905 $exit->msg (undef);
1906 }
1907}
1908
1909sub cf::object::player::enter_exit {
1910 my ($self, $exit) = @_;
1911
1912 return unless $self->type == cf::PLAYER;
1913
1914 $self->enter_link;
1915
1916 (async {
1917 $self->deactivate_recursive; # just to be sure
1918 unless (eval {
1919 prepare_random_map $exit
1920 if $exit->slaying eq "/!";
1921
1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924
1925 1;
1926 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. "
1928 . "I'll try to bring you back to the map you were before. "
1929 . "Please report this to the dungeon master!",
1930 cf::NDI_UNIQUE | cf::NDI_RED);
1931
1932 warn "ERROR in enter_exit: $@";
1933 $self->leave_link;
1934 }
1935 })->prio (1);
1936}
1937
1078=head3 cf::client 1938=head3 cf::client
1079 1939
1080=over 4 1940=over 4
1081 1941
1082=item $client->send_drawinfo ($text, $flags) 1942=item $client->send_drawinfo ($text, $flags)
1125 on_reply => sub { 1985 on_reply => sub {
1126 my ($ns, $msg) = @_; 1986 my ($ns, $msg) = @_;
1127 1987
1128 # this weird shuffling is so that direct followup queries 1988 # this weird shuffling is so that direct followup queries
1129 # get handled first 1989 # get handled first
1130 my $queue = delete $ns->{query_queue}; 1990 my $queue = delete $ns->{query_queue}
1991 or return; # be conservative, not sure how that can happen, but we saw a crash here
1131 1992
1132 (shift @$queue)->[1]->($msg); 1993 (shift @$queue)->[1]->($msg);
1133 1994
1134 push @{ $ns->{query_queue} }, @$queue; 1995 push @{ $ns->{query_queue} }, @$queue;
1135 1996
1141 } 2002 }
1142 } 2003 }
1143 }, 2004 },
1144); 2005);
1145 2006
1146=item $client->coro (\&cb) 2007=item $client->async (\&cb)
1147 2008
1148Create a new coroutine, running the specified callback. The coroutine will 2009Create a new coroutine, running the specified callback. The coroutine will
1149be automatically cancelled when the client gets destroyed (e.g. on logout, 2010be automatically cancelled when the client gets destroyed (e.g. on logout,
1150or loss of connection). 2011or loss of connection).
1151 2012
1152=cut 2013=cut
1153 2014
1154sub cf::client::coro { 2015sub cf::client::async {
1155 my ($self, $cb) = @_; 2016 my ($self, $cb) = @_;
1156 2017
1157 my $coro; $coro = async { 2018 my $coro = &Coro::async ($cb);
1158 eval {
1159 $cb->();
1160 };
1161 warn $@ if $@;
1162 };
1163 2019
1164 $coro->on_destroy (sub { 2020 $coro->on_destroy (sub {
1165 delete $self->{_coro}{$coro+0}; 2021 delete $self->{_coro}{$coro+0};
1166 }); 2022 });
1167 2023
1339 2195
1340{ 2196{
1341 my $path = cf::localdir . "/database.pst"; 2197 my $path = cf::localdir . "/database.pst";
1342 2198
1343 sub db_load() { 2199 sub db_load() {
1344 warn "loading database $path\n";#d# remove later
1345 $DB = stat $path ? Storable::retrieve $path : { }; 2200 $DB = stat $path ? Storable::retrieve $path : { };
1346 } 2201 }
1347 2202
1348 my $pid; 2203 my $pid;
1349 2204
1350 sub db_save() { 2205 sub db_save() {
1351 warn "saving database $path\n";#d# remove later
1352 waitpid $pid, 0 if $pid; 2206 waitpid $pid, 0 if $pid;
1353 if (0 == ($pid = fork)) { 2207 if (0 == ($pid = fork)) {
1354 $DB->{_meta}{version} = 1; 2208 $DB->{_meta}{version} = 1;
1355 Storable::nstore $DB, "$path~"; 2209 Storable::nstore $DB, "$path~";
1356 rename "$path~", $path; 2210 rename "$path~", $path;
1404 open my $fh, "<:utf8", cf::confdir . "/config" 2258 open my $fh, "<:utf8", cf::confdir . "/config"
1405 or return; 2259 or return;
1406 2260
1407 local $/; 2261 local $/;
1408 *CFG = YAML::Syck::Load <$fh>; 2262 *CFG = YAML::Syck::Load <$fh>;
2263
2264 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2265
2266 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2267 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2268
2269 if (exists $CFG{mlockall}) {
2270 eval {
2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2272 and die "WARNING: m(un)lockall failed: $!\n";
2273 };
2274 warn $@ if $@;
2275 }
1409} 2276}
1410 2277
1411sub main { 2278sub main {
1412 # we must not ever block the main coroutine 2279 # we must not ever block the main coroutine
1413 local $Coro::idle = sub { 2280 local $Coro::idle = sub {
1414 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1415 (Coro::unblock_sub {
1416 Event::one_event; 2282 async { Event::one_event };
1417 })->();
1418 }; 2283 };
1419 2284
1420 cfg_load; 2285 cfg_load;
1421 db_load; 2286 db_load;
1422 load_extensions; 2287 load_extensions;
1423 Event::loop; 2288 Event::loop;
1424} 2289}
1425 2290
1426############################################################################# 2291#############################################################################
1427# initialisation 2292# initialisation and cleanup
1428 2293
2294# install some emergency cleanup handlers
2295BEGIN {
2296 for my $signal (qw(INT HUP TERM)) {
2297 Event->signal (
2298 data => WF_AUTOCANCEL,
2299 signal => $signal,
2300 cb => sub {
2301 cf::cleanup "SIG$signal";
2302 },
2303 );
2304 }
2305}
2306
2307sub emergency_save() {
2308 my $freeze_guard = cf::freeze_mainloop;
2309
2310 warn "enter emergency perl save\n";
2311
2312 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously.
2316 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next;
2320 $pl->save;
2321 }
2322 warn "end emergency player save\n";
2323
2324 warn "begin emergency map save\n";
2325 for my $path (keys %cf::MAP) {
2326 my $map = $cf::MAP{$path} or next;
2327 $map->valid or next;
2328 $map->save;
2329 }
2330 warn "end emergency map save\n";
2331 };
2332
2333 warn "leave emergency perl save\n";
2334}
2335
1429sub perl_reload() { 2336sub reload() {
1430 # can/must only be called in main 2337 # can/must only be called in main
1431 if ($Coro::current != $Coro::main) { 2338 if ($Coro::current != $Coro::main) {
1432 warn "can only reload from main coroutine\n"; 2339 warn "can only reload from main coroutine\n";
1433 return; 2340 return;
1434 } 2341 }
1435 2342
1436 warn "reloading..."; 2343 warn "reloading...";
1437 2344
1438 local $FREEZE = 1; 2345 my $guard = freeze_mainloop;
1439 cf::emergency_save; 2346 cf::emergency_save;
1440 2347
1441 eval { 2348 eval {
1442 # if anything goes wrong in here, we should simply crash as we already saved 2349 # if anything goes wrong in here, we should simply crash as we already saved
1443 2350
1505 cf::load_extensions; 2412 cf::load_extensions;
1506 2413
1507 # reattach attachments to objects 2414 # reattach attachments to objects
1508 warn "reattach"; 2415 warn "reattach";
1509 _global_reattach; 2416 _global_reattach;
2417 reattach $_ for values %MAP;
1510 }; 2418 };
1511 2419
1512 if ($@) { 2420 if ($@) {
1513 warn $@; 2421 warn $@;
1514 warn "error while reloading, exiting."; 2422 warn "error while reloading, exiting.";
1527 $LINK_MAP->height (41); 2435 $LINK_MAP->height (41);
1528 $LINK_MAP->alloc; 2436 $LINK_MAP->alloc;
1529 $LINK_MAP->path ("{link}"); 2437 $LINK_MAP->path ("{link}");
1530 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1531 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2440
2441 # dirty hack because... archetypes are not yet loaded
2442 Event->timer (
2443 after => 10,
2444 cb => sub {
2445 $_[0]->w->cancel;
2446
2447 # provide some exits "home"
2448 my $exit = cf::object::new "exit";
2449
2450 $exit->slaying ($EMERGENCY_POSITION->[0]);
2451 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2452 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2453
2454 $LINK_MAP->insert ($exit->clone, 19, 19);
2455 $LINK_MAP->insert ($exit->clone, 19, 20);
2456 $LINK_MAP->insert ($exit->clone, 19, 21);
2457 $LINK_MAP->insert ($exit->clone, 20, 19);
2458 $LINK_MAP->insert ($exit->clone, 20, 21);
2459 $LINK_MAP->insert ($exit->clone, 21, 19);
2460 $LINK_MAP->insert ($exit->clone, 21, 20);
2461 $LINK_MAP->insert ($exit->clone, 21, 21);
2462
2463 $exit->destroy;
2464 });
2465
2466 $LINK_MAP->{deny_save} = 1;
2467 $LINK_MAP->{deny_reset} = 1;
2468
2469 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1532} 2470}
1533 2471
1534register "<global>", __PACKAGE__; 2472register "<global>", __PACKAGE__;
1535 2473
1536register_command "perl-reload" => sub { 2474register_command "reload" => sub {
1537 my ($who, $arg) = @_; 2475 my ($who, $arg) = @_;
1538 2476
1539 if ($who->flag (FLAG_WIZ)) { 2477 if ($who->flag (FLAG_WIZ)) {
1540 $who->message ("start of reload."); 2478 $who->message ("start of reload.");
1541 perl_reload; 2479 reload;
1542 $who->message ("end of reload."); 2480 $who->message ("end of reload.");
1543 } 2481 }
1544}; 2482};
1545 2483
1546unshift @INC, $LIBDIR; 2484unshift @INC, $LIBDIR;
1549 reentrant => 0, 2487 reentrant => 0,
1550 prio => 0, 2488 prio => 0,
1551 at => $NEXT_TICK || $TICK, 2489 at => $NEXT_TICK || $TICK,
1552 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
1553 cb => sub { 2491 cb => sub {
1554 unless ($FREEZE) {
1555 cf::server_tick; # one server iteration 2492 cf::server_tick; # one server iteration
1556 $RUNTIME += $TICK; 2493 $RUNTIME += $TICK;
1557 }
1558
1559 $NEXT_TICK += $TICK; 2494 $NEXT_TICK += $TICK;
2495
2496 $WAIT_FOR_TICK->broadcast;
2497 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
1560 2498
1561 # if we are delayed by four ticks or more, skip them all 2499 # if we are delayed by four ticks or more, skip them all
1562 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1563 2501
1564 $TICK_WATCHER->at ($NEXT_TICK); 2502 $TICK_WATCHER->at ($NEXT_TICK);
1586 or warn "ERROR: unable to write runtime file: $!"; 2524 or warn "ERROR: unable to write runtime file: $!";
1587 })->(); 2525 })->();
1588 }, 2526 },
1589); 2527);
1590 2528
2529END { cf::emergency_save }
2530
15911 25311
1592 2532

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines