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.128 by root, Wed Jan 3 00:28:47 2007 UTC vs.
Revision 1.145 by root, Sun Jan 7 21:54:59 2007 UTC

… …
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 185=item cf::lock_wait $string
209 186
210Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
211 188
212=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
213 190
214Wait until the given lock is available and then acquires it and returns 191Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
217returned. 194returned.
218 195
219Lock names should begin with a unique identifier (for example, find_map 196Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 197uses map_find and cf::map::load uses map_load).
221 198
222=cut 199=cut
223 200
224our %LOCK; 201our %LOCK;
225 202
… …
239 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
240 lock_wait $key; 217 lock_wait $key;
241 218
242 $LOCK{$key} = []; 219 $LOCK{$key} = [];
243 220
244 cf::guard { 221 Coro::guard {
245 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
247 } 224 }
248} 225}
249 226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
250=item cf::async { BLOCK } 235=item cf::async { BLOCK }
251 236
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 237Currently the same as Coro::async_pool, meaning you cannot use
253error instead of exiting the server in case of a problem. 238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
254 240
255=cut 241=cut
256 242
257sub async(&) { 243BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 244
266=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
267 246
268The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
283 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
285 264
286 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 266 # (but this is cancel-safe)
288 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
289 268
290 my $busy = 1; 269 my $busy = 1;
291 my @res; 270 my @res;
292 271
293 (Coro::async { 272 (async {
294 @res = eval { $job->() }; 273 @res = eval { $job->() };
295 warn $@ if $@; 274 warn $@ if $@;
296 undef $busy; 275 undef $busy;
297 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
298 277
299 while ($busy) { 278 while ($busy) {
300 Coro::cede_notself; 279 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 280 }
303 281
304 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
305 } else { 283 } else {
306 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
307 285
308 $job->() 286 $job->()
309 } 287 }
310} 288}
311 289
312=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
313 291
314Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
315when the extension calling this is being unloaded. 293extension calling this is being unloaded.
316 294
317=cut 295=cut
318 296
319sub coro(&) { 297sub async_ext(&) {
320 my $cb = shift; 298 my $cb = shift;
321 299
322 my $coro = &cf::async ($cb); 300 my $coro = &Coro::async ($cb);
323 301
324 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
326 }); 304 });
327 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1094 1072
1095=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1096 1074
1097Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1098 1076
1077=cut
1078
1079package cf::player;
1080
1099=head3 cf::player 1081=head3 cf::player
1100 1082
1101=over 4 1083=over 4
1102 1084
1103=item cf::player::exists $login 1085=item cf::player::find $login
1104 1086
1105Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1106 1088
1107=cut 1089=cut
1108 1090
1109sub cf::player::exists($) { 1091sub playerdir($) {
1110 cf::player::find $_[0] 1092 cf::localdir
1111 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137 $pl->{last_save} = $cf::RUNTIME;
1138
1139 Coro::cede;
1140 $pl->save_pl ($path);
1141 Coro::cede;
1142}
1143
1144sub new($) {
1145 my ($login) = @_;
1146
1147 my $self = create;
1148
1149 $self->ob->name ($login);
1150 $self->{deny_save} = 1;
1151
1152 $cf::PLAYER{$login} = $self;
1153
1154 $self
1155}
1156
1157sub quit_character {
1158 my ($pl) = @_;
1159
1160 $pl->{deny_save} = 1;
1161 $pl->password ("*"); # this should lock out the player until we nuked the dir
1162
1163 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1164 $pl->deactivate;
1165 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1166 $pl->ns->destroy if $pl->ns;
1167
1168 my $path = playerdir $pl;
1169 my $temp = "$path~$cf::RUNTIME~deleting~";
1170 IO::AIO::aio_rename $path, $temp, sub {
1171 delete $cf::PLAYER{$pl->ob->name};
1172 $pl->destroy;
1173
1174 IO::AIO::aio_rmtree $temp;
1175 };
1112} 1176}
1113 1177
1114=item $player->ext_reply ($msgid, $msgtype, %msg) 1178=item $player->ext_reply ($msgid, $msgtype, %msg)
1115 1179
1116Sends an ext reply to the player. 1180Sends an ext reply to the player.
1117 1181
1118=cut 1182=cut
1119 1183
1120sub cf::player::ext_reply($$$%) { 1184sub ext_reply($$$%) {
1121 my ($self, $id, %msg) = @_; 1185 my ($self, $id, %msg) = @_;
1122 1186
1123 $msg{msgid} = $id; 1187 $msg{msgid} = $id;
1124 1188
1125 $self->send ("ext " . to_json \%msg); 1189 $self->send ("ext " . cf::to_json \%msg);
1126} 1190}
1191
1192package cf;
1127 1193
1128=back 1194=back
1129 1195
1130 1196
1131=head3 cf::map 1197=head3 cf::map
… …
1137package cf::map; 1203package cf::map;
1138 1204
1139use Fcntl; 1205use Fcntl;
1140use Coro::AIO; 1206use Coro::AIO;
1141 1207
1142our $MAX_RESET = 7200; 1208our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1209our $DEFAULT_RESET = 3000;
1144 1210
1145sub generate_random_map { 1211sub generate_random_map {
1146 my ($path, $rmp) = @_; 1212 my ($path, $rmp) = @_;
1147 1213
1148 # mit "rum" bekleckern, nicht 1214 # mit "rum" bekleckern, nicht
… …
1178 or return; 1244 or return;
1179 1245
1180 my $map = cf::map::new 1246 my $map = cf::map::new
1181 or return; 1247 or return;
1182 1248
1249 # for better error messages only, will be overwritten
1250 $map->path ($path);
1251
1183 $map->load_header ($path) 1252 $map->load_header ($path)
1184 or return; 1253 or return;
1185 1254
1186 $map->{load_path} = $path; 1255 $map->{load_path} = $path;
1187 1256
1188 $map 1257 $map
1189} 1258}
1190 1259
1191sub find_map; 1260sub find;
1192sub find_map { 1261sub find {
1193 my ($path, $origin) = @_; 1262 my ($path, $origin) = @_;
1194 1263
1195 #warn "find_map<$path,$origin>\n";#d# 1264 #warn "find<$path,$origin>\n";#d#
1196 1265
1197 $path = new cf::path $path, $origin && $origin->path; 1266 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1267 my $key = $path->as_string;
1199 1268
1200 cf::lock_wait "map_find:$key"; 1269 cf::lock_wait "map_find:$key";
… …
1203 my $guard = cf::lock_acquire "map_find:$key"; 1272 my $guard = cf::lock_acquire "map_find:$key";
1204 1273
1205 # do it the slow way 1274 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1275 my $map = try_load_header $path->save_path;
1207 1276
1277 Coro::cede;
1278
1208 if ($map) { 1279 if ($map) {
1280 $map->last_access ((delete $map->{last_access})
1281 || $cf::RUNTIME); #d#
1209 # safety 1282 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1283 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1284 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1285 } else {
1213 if (my $rmp = $path->random_map_params) { 1286 if (my $rmp = $path->random_map_params) {
… …
1218 1291
1219 $map or return; 1292 $map or return;
1220 1293
1221 $map->{load_original} = 1; 1294 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1295 $map->{instantiate_time} = $cf::RUNTIME;
1296 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1297 $map->instantiate;
1224 1298
1225 # per-player maps become, after loading, normal maps 1299 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1300 $map->per_player (0) if $path->{user_rel};
1227 } 1301 }
1228 1302
1229 $map->path ($key); 1303 $map->path ($key);
1230 $map->{path} = $path; 1304 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1305 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1306
1307 Coro::cede;
1233 1308
1234 if ($map->should_reset) { 1309 if ($map->should_reset) {
1235 $map->reset; 1310 $map->reset;
1236 undef $guard; 1311 undef $guard;
1237 $map = find_map $path 1312 $map = find $path
1238 or return; 1313 or return;
1239 } 1314 }
1240 1315
1241 $cf::MAP{$key} = $map 1316 $cf::MAP{$key} = $map
1242 } 1317 }
… …
1264 if (aio_open $uniq, O_RDONLY, 0) { 1339 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1340 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1341 $self->load_objects ($uniq, 0);
1267 } 1342 }
1268 } 1343 }
1344
1345 Coro::cede;
1269 1346
1270 # now do the right thing for maps 1347 # now do the right thing for maps
1271 $self->link_multipart_objects; 1348 $self->link_multipart_objects;
1272 1349
1273 if ($self->{path}->is_style_map) { 1350 if ($self->{path}->is_style_map) {
… …
1281 $self->difficulty ($self->estimate_difficulty) 1358 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1359 unless $self->difficulty;
1283 $self->activate; 1360 $self->activate;
1284 } 1361 }
1285 1362
1363 Coro::cede;
1364
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1365 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1366}
1288 1367
1289sub load_map_sync { 1368sub find_sync {
1290 my ($path, $origin) = @_; 1369 my ($path, $origin) = @_;
1291 1370
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1371 cf::sync_job { cf::map::find $path, $origin }
1372}
1293 1373
1294 cf::sync_job { 1374sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1375 my ($map) = @_;
1296 or return; 1376
1297 $map->load; 1377 cf::sync_job { $map->load };
1298 $map
1299 }
1300} 1378}
1301 1379
1302sub save { 1380sub save {
1303 my ($self) = @_; 1381 my ($self) = @_;
1304 1382
1383 my $lock = cf::lock_acquire "map_data:" . $self->path;
1384
1305 $self->{last_save} = $cf::RUNTIME; 1385 $self->{last_save} = $cf::RUNTIME;
1306 1386
1307 return unless $self->dirty; 1387 return unless $self->dirty;
1308 1388
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1389 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1390 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1391
1312 $self->{load_path} = $save; 1392 $self->{load_path} = $save;
1313 1393
1314 return if $self->{deny_save}; 1394 return if $self->{deny_save};
1395
1396 local $self->{last_access} = $self->last_access;#d#
1397
1398 cf::async {
1399 $_->contr->save for $self->players;
1400 };
1315 1401
1316 if ($uniq) { 1402 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1403 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1404 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1405 } else {
… …
1322} 1408}
1323 1409
1324sub swap_out { 1410sub swap_out {
1325 my ($self) = @_; 1411 my ($self) = @_;
1326 1412
1413 # save first because save cedes
1414 $self->save;
1415
1416 my $lock = cf::lock_acquire "map_data:" . $self->path;
1417
1327 return if $self->players; 1418 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1419 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1420 return if $self->{deny_save};
1330 1421
1331 $self->save;
1332 $self->clear; 1422 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1423 $self->in_memory (cf::MAP_SWAPPED);
1334} 1424}
1335 1425
1336sub reset_at { 1426sub reset_at {
… …
1374} 1464}
1375 1465
1376sub reset { 1466sub reset {
1377 my ($self) = @_; 1467 my ($self) = @_;
1378 1468
1469 my $lock = cf::lock_acquire "map_data:" . $self->path;
1470
1379 return if $self->players; 1471 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1472 return if $self->{path}{user_rel};#d#
1381 1473
1382 warn "resetting map ", $self->path;#d# 1474 warn "resetting map ", $self->path;#d#
1383 1475
… …
1402 1494
1403sub customise_for { 1495sub customise_for {
1404 my ($map, $ob) = @_; 1496 my ($map, $ob) = @_;
1405 1497
1406 if ($map->per_player) { 1498 if ($map->per_player) {
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1499 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1408 } 1500 }
1409 1501
1410 $map 1502 $map
1411} 1503}
1412 1504
1413sub emergency_save { 1505sub emergency_save {
1414 local $cf::FREEZE = 1; 1506 my $freeze_guard = cf::freeze_mainloop;
1415 1507
1416 warn "enter emergency map save\n"; 1508 warn "enter emergency perl save\n";
1417 1509
1418 cf::sync_job { 1510 cf::sync_job {
1511 warn "begin emergency player save\n";
1512 $_->save for values %cf::PLAYER;
1513 warn "end emergency player save\n";
1514
1419 warn "begin emergency map save\n"; 1515 warn "begin emergency map save\n";
1420 $_->save for values %cf::MAP; 1516 $_->save for values %cf::MAP;
1517 warn "end emergency map save\n";
1421 }; 1518 };
1422 1519
1423 warn "end emergency map save\n"; 1520 warn "leave emergency perl save\n";
1424} 1521}
1425 1522
1426package cf; 1523package cf;
1427 1524
1428=back 1525=back
… …
1509 my $link_pos = delete $self->{_link_pos}; 1606 my $link_pos = delete $self->{_link_pos};
1510 1607
1511 unless ($map) { 1608 unless ($map) {
1512 # restore original map position 1609 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1610 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1611 $map = cf::map::find $map;
1515 1612
1516 unless ($map) { 1613 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1614 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1615 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1616 or die "FATAL: cannot load emergency map\n";
1520 } 1617 }
1521 } 1618 }
1522 1619
1523 ($x, $y) = (-1, -1) 1620 ($x, $y) = (-1, -1)
… …
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1624 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1625 if $x <=0 && $y <= 0;
1529 1626
1530 $map->load; 1627 $map->load;
1531 1628
1629 return unless $self->contr->active;
1532 $self->activate_recursive; 1630 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1631 $self->enter_map ($map, $x, $y);
1534} 1632}
1535 1633
1536cf::player->attach ( 1634cf::player->attach (
… …
1549 1647
1550 # try to abort aborted map switching on player login :) 1648 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1649 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1650 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1651 $pl->ob->enter_link;
1554 cf::async { 1652 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1653 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1654 # and this sleep increases chances of the player not ending up in scorn
1655 $pl->ob->reply (undef,
1656 "There was an internal problem at your last logout, "
1657 . "the server will try to bring you to your intended destination in a second.",
1658 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1659 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1660 $pl->ob->leave_link;
1559 }; 1661 })->prio (2);
1560 } 1662 }
1561 }, 1663 },
1562); 1664);
1563 1665
1564=item $player_object->goto_map ($path, $x, $y) 1666=item $player_object->goto ($path, $x, $y)
1565 1667
1566=cut 1668=cut
1567 1669
1568sub cf::object::player::goto_map { 1670sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1671 my ($self, $path, $x, $y) = @_;
1570 1672
1571 $self->enter_link; 1673 $self->enter_link;
1572 1674
1573 (cf::async { 1675 (async {
1574 $path = new cf::path $path; 1676 $path = new cf::path $path;
1575 1677
1576 my $map = cf::map::find_map $path->as_string; 1678 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1679 $map = $map->customise_for ($self) if $map;
1578 1680
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1681# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1682# if $map;
1581 1683
… …
1640 1742
1641 return unless $self->type == cf::PLAYER; 1743 return unless $self->type == cf::PLAYER;
1642 1744
1643 $self->enter_link; 1745 $self->enter_link;
1644 1746
1645 (cf::async { 1747 (async {
1748 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1749 unless (eval {
1647 prepare_random_map $exit 1750 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1751 if $exit->slaying eq "/!";
1649 1752
1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1753 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1754 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1755
1653 1; 1756 1;
1654 }) { 1757 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1758 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1759 . "I'll try to bring you back to the map you were before. "
… …
1714 my ($ns, $msg) = @_; 1817 my ($ns, $msg) = @_;
1715 1818
1716 # this weird shuffling is so that direct followup queries 1819 # this weird shuffling is so that direct followup queries
1717 # get handled first 1820 # get handled first
1718 my $queue = delete $ns->{query_queue} 1821 my $queue = delete $ns->{query_queue}
1719 or return; # be conservative, not sure how that cna happen, but we saw a crash here 1822 or return; # be conservative, not sure how that can happen, but we saw a crash here
1720 1823
1721 (shift @$queue)->[1]->($msg); 1824 (shift @$queue)->[1]->($msg);
1722 1825
1723 push @{ $ns->{query_queue} }, @$queue; 1826 push @{ $ns->{query_queue} }, @$queue;
1724 1827
… …
1730 } 1833 }
1731 } 1834 }
1732 }, 1835 },
1733); 1836);
1734 1837
1735=item $client->coro (\&cb) 1838=item $client->async (\&cb)
1736 1839
1737Create a new coroutine, running the specified callback. The coroutine will 1840Create a new coroutine, running the specified callback. The coroutine will
1738be automatically cancelled when the client gets destroyed (e.g. on logout, 1841be automatically cancelled when the client gets destroyed (e.g. on logout,
1739or loss of connection). 1842or loss of connection).
1740 1843
1741=cut 1844=cut
1742 1845
1743sub cf::client::coro { 1846sub cf::client::async {
1744 my ($self, $cb) = @_; 1847 my ($self, $cb) = @_;
1745 1848
1746 my $coro = &cf::async ($cb); 1849 my $coro = &Coro::async ($cb);
1747 1850
1748 $coro->on_destroy (sub { 1851 $coro->on_destroy (sub {
1749 delete $self->{_coro}{$coro+0}; 1852 delete $self->{_coro}{$coro+0};
1750 }); 1853 });
1751 1854
… …
1986 open my $fh, "<:utf8", cf::confdir . "/config" 2089 open my $fh, "<:utf8", cf::confdir . "/config"
1987 or return; 2090 or return;
1988 2091
1989 local $/; 2092 local $/;
1990 *CFG = YAML::Syck::Load <$fh>; 2093 *CFG = YAML::Syck::Load <$fh>;
2094
2095 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2096
2097 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2098 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2099
2100 if (exists $CFG{mlockall}) {
2101 eval {
2102 $CFG{mlockall} ? &mlockall : &munlockall
2103 and die "WARNING: m(un)lockall failed: $!\n";
2104 };
2105 warn $@ if $@;
2106 }
1991} 2107}
1992 2108
1993sub main { 2109sub main {
1994 # we must not ever block the main coroutine 2110 # we must not ever block the main coroutine
1995 local $Coro::idle = sub { 2111 local $Coro::idle = sub {
1996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2112 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1997 (Coro::unblock_sub {
1998 Event::one_event; 2113 async { Event::one_event };
1999 })->();
2000 }; 2114 };
2001 2115
2002 cfg_load; 2116 cfg_load;
2003 db_load; 2117 db_load;
2004 load_extensions; 2118 load_extensions;
… …
2015 return; 2129 return;
2016 } 2130 }
2017 2131
2018 warn "reloading..."; 2132 warn "reloading...";
2019 2133
2020 local $FREEZE = 1; 2134 my $guard = freeze_mainloop;
2021 cf::emergency_save; 2135 cf::emergency_save;
2022 2136
2023 eval { 2137 eval {
2024 # if anything goes wrong in here, we should simply crash as we already saved 2138 # if anything goes wrong in here, we should simply crash as we already saved
2025 2139
… …
2087 cf::load_extensions; 2201 cf::load_extensions;
2088 2202
2089 # reattach attachments to objects 2203 # reattach attachments to objects
2090 warn "reattach"; 2204 warn "reattach";
2091 _global_reattach; 2205 _global_reattach;
2206 reattach $_ for values %MAP;
2092 }; 2207 };
2093 2208
2094 if ($@) { 2209 if ($@) {
2095 warn $@; 2210 warn $@;
2096 warn "error while reloading, exiting."; 2211 warn "error while reloading, exiting.";
… …
2112 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2113 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2114 2229
2115 # dirty hack because... archetypes are not yet loaded 2230 # dirty hack because... archetypes are not yet loaded
2116 Event->timer ( 2231 Event->timer (
2117 after => 2, 2232 after => 10,
2118 cb => sub { 2233 cb => sub {
2119 $_[0]->w->cancel; 2234 $_[0]->w->cancel;
2120 2235
2121 # provide some exits "home" 2236 # provide some exits "home"
2122 my $exit = cf::object::new "exit"; 2237 my $exit = cf::object::new "exit";
… …
2161 reentrant => 0, 2276 reentrant => 0,
2162 prio => 0, 2277 prio => 0,
2163 at => $NEXT_TICK || $TICK, 2278 at => $NEXT_TICK || $TICK,
2164 data => WF_AUTOCANCEL, 2279 data => WF_AUTOCANCEL,
2165 cb => sub { 2280 cb => sub {
2166 unless ($FREEZE) {
2167 cf::server_tick; # one server iteration 2281 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2282 $RUNTIME += $TICK;
2169 }
2170
2171 $NEXT_TICK += $TICK; 2283 $NEXT_TICK += $TICK;
2172 2284
2173 # if we are delayed by four ticks or more, skip them all 2285 # if we are delayed by four ticks or more, skip them all
2174 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2286 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2175 2287

Diff Legend

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